From bc141dc0881e8ae188559a1bae8c42da5f689448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BAben=20Fonseca?= <fonseka@gmail.com>
Date: Fri, 11 Oct 2024 00:14:44 +0000
Subject: [PATCH] fix(schema): CloudFormation Updates

---
 ...a-certificateauthority_crlconfiguration.go |     4 +-
 ...cmpca-certificateauthority_edipartyname.go |     4 +-
 ...-certificateauthority_ocspconfiguration.go |     4 +-
 cloudformation/all.go                         |  1837 +-
 .../amazonmq/aws-amazonmq-broker.go           |     8 +-
 .../amazonmq/aws-amazonmq-configuration.go    |     4 +-
 cloudformation/amplify/aws-amplify-app.go     |     5 +
 .../amplify/aws-amplify-app_cacheconfig.go    |    37 +
 .../aws-apigatewayv2-integration.go           |     6 +-
 ...gatewayv2-integration_responseparameter.go |     8 +-
 ...ewayv2-integration_responseparametermap.go |    37 +
 .../aws-appintegrations-application.go        |     4 +-
 ...pplicationsignals-servicelevelobjective.go |   143 +
 ...-servicelevelobjective_calendarinterval.go |    47 +
 ...signals-servicelevelobjective_dimension.go |    42 +
 ...ationsignals-servicelevelobjective_goal.go |    47 +
 ...nsignals-servicelevelobjective_interval.go |    42 +
 ...ionsignals-servicelevelobjective_metric.go |    47 +
 ...s-servicelevelobjective_metricdataquery.go |    57 +
 ...ignals-servicelevelobjective_metricstat.go |    52 +
 ...elobjective_monitoredrequestcountmetric.go |    42 +
 ...s-servicelevelobjective_requestbasedsli.go |    47 +
 ...icelevelobjective_requestbasedslimetric.go |    57 +
 ...s-servicelevelobjective_rollinginterval.go |    42 +
 ...cationsignals-servicelevelobjective_sli.go |    47 +
 ...signals-servicelevelobjective_slimetric.go |    62 +
 .../apptest/aws-apptest-testcase.go           |   132 +
 .../apptest/aws-apptest-testcase_batch.go     |    47 +
 ...s-apptest-testcase_cloudformationaction.go |    42 +
 .../aws-apptest-testcase_compareaction.go     |    42 +
 .../aws-apptest-testcase_databasecdc.go       |    42 +
 .../apptest/aws-apptest-testcase_dataset.go   |    57 +
 .../aws-apptest-testcase_filemetadata.go      |    42 +
 .../apptest/aws-apptest-testcase_input.go     |    37 +
 .../apptest/aws-apptest-testcase_inputfile.go |    47 +
 ...test-testcase_m2managedactionproperties.go |    42 +
 ...est-testcase_m2managedapplicationaction.go |    47 +
 ...-testcase_m2nonmanagedapplicationaction.go |    42 +
 .../aws-apptest-testcase_mainframeaction.go   |    47 +
 ...test-testcase_mainframeactionproperties.go |    37 +
 ...ws-apptest-testcase_mainframeactiontype.go |    42 +
 .../apptest/aws-apptest-testcase_output.go    |    37 +
 .../aws-apptest-testcase_outputfile.go        |    37 +
 .../aws-apptest-testcase_resourceaction.go    |    47 +
 .../apptest/aws-apptest-testcase_script.go    |    42 +
 ...apptest-testcase_sourcedatabasemetadata.go |    42 +
 .../apptest/aws-apptest-testcase_step.go      |    47 +
 .../aws-apptest-testcase_stepaction.go        |    47 +
 ...apptest-testcase_targetdatabasemetadata.go |    42 +
 ...-apptest-testcase_testcaselatestversion.go |    42 +
 .../apptest/aws-apptest-testcase_tn3270.go    |    42 +
 ...ift-autoshiftobservernotificationstatus.go |   117 +
 ...ingpolicy_customizedmetricspecification.go |    17 +-
 ...ingpolicy_targettrackingmetricdataquery.go |    57 +
 ...-scalingpolicy_targettrackingmetricstat.go |    47 +
 .../aws-b2bi-capability_ediconfiguration.go   |     5 +
 cloudformation/b2bi/aws-b2bi-partnership.go   |     9 +-
 .../aws-b2bi-partnership_capabilityoptions.go |    37 +
 ...aws-b2bi-partnership_outboundedioptions.go |    37 +
 .../aws-b2bi-partnership_x12delimiters.go     |    47 +
 .../b2bi/aws-b2bi-partnership_x12envelope.go  |    37 +
 ...i-partnership_x12functionalgroupheaders.go |    47 +
 ...artnership_x12interchangecontrolheaders.go |    67 +
 ...-b2bi-partnership_x12outboundediheaders.go |    52 +
 cloudformation/b2bi/aws-b2bi-transformer.go   |    32 +-
 .../aws-b2bi-transformer_formatoptions.go     |    37 +
 .../aws-b2bi-transformer_inputconversion.go   |    42 +
 .../b2bi/aws-b2bi-transformer_mapping.go      |    42 +
 .../aws-b2bi-transformer_outputconversion.go  |    42 +
 ...aws-b2bi-transformer_sampledocumentkeys.go |    42 +
 .../aws-b2bi-transformer_sampledocuments.go   |    42 +
 .../backup/aws-backup-restoretestingplan.go   |     5 +
 .../batch/aws-batch-computeenvironment.go     |     5 +
 ...s-batch-jobdefinition_noderangeproperty.go |     5 +
 cloudformation/bedrock/aws-bedrock-agent.go   |     5 +
 .../aws-bedrock-agent_actiongroupexecutor.go  |     9 +-
 .../aws-bedrock-agent_agentactiongroup.go     |     5 +
 .../bedrock/aws-bedrock-agent_function.go     |    47 +
 .../aws-bedrock-agent_functionschema.go       |    37 +
 ...ws-bedrock-agent_guardrailconfiguration.go |    42 +
 .../aws-bedrock-agent_parameterdetail.go      |    47 +
 .../bedrock/aws-bedrock-datasource.go         |     5 +
 ...rce_bedrockfoundationmodelconfiguration.go |    42 +
 ...edrock-datasource_chunkingconfiguration.go |    10 +
 ...tasource_confluencecrawlerconfiguration.go |    37 +
 ...ource_confluencedatasourceconfiguration.go |    42 +
 ...atasource_confluencesourceconfiguration.go |    52 +
 ...ock-datasource_crawlfilterconfiguration.go |    42 +
 ...ource_customtransformationconfiguration.go |    42 +
 ...rock-datasource_datasourceconfiguration.go |    24 +-
 ...ource_hierarchicalchunkingconfiguration.go |    42 +
 ..._hierarchicalchunkinglevelconfiguration.go |    37 +
 ...-bedrock-datasource_intermediatestorage.go |    37 +
 ...bedrock-datasource_parsingconfiguration.go |    42 +
 .../aws-bedrock-datasource_parsingprompt.go   |    37 +
 ...-bedrock-datasource_patternobjectfilter.go |    47 +
 ...source_patternobjectfilterconfiguration.go |    37 +
 ...ck-datasource_s3datasourceconfiguration.go |     5 +
 .../aws-bedrock-datasource_s3location.go      |    37 +
 ...tasource_salesforcecrawlerconfiguration.go |    37 +
 ...ource_salesforcedatasourceconfiguration.go |    42 +
 ...atasource_salesforcesourceconfiguration.go |    47 +
 .../bedrock/aws-bedrock-datasource_seedurl.go |    37 +
 ...atasource_semanticchunkingconfiguration.go |    47 +
 ...tasource_sharepointcrawlerconfiguration.go |    37 +
 ...ource_sharepointdatasourceconfiguration.go |    42 +
 ...atasource_sharepointsourceconfiguration.go |    62 +
 .../aws-bedrock-datasource_transformation.go  |    42 +
 ...drock-datasource_transformationfunction.go |    37 +
 ...ource_transformationlambdaconfiguration.go |    37 +
 ...aws-bedrock-datasource_urlconfiguration.go |    37 +
 ...datasource_vectoringestionconfiguration.go |    10 +
 ...rock-datasource_webcrawlerconfiguration.go |    52 +
 ...aws-bedrock-datasource_webcrawlerlimits.go |    37 +
 ...k-datasource_webdatasourceconfiguration.go |    42 +
 ...drock-datasource_websourceconfiguration.go |    37 +
 cloudformation/bedrock/aws-bedrock-flow.go    |   162 +
 ...bedrock-flow_agentflownodeconfiguration.go |    37 +
 ...ock-flow_conditionflownodeconfiguration.go |    37 +
 .../bedrock/aws-bedrock-flow_flowcondition.go |    42 +
 ..._flowconditionalconnectionconfiguration.go |    37 +
 .../aws-bedrock-flow_flowconnection.go        |    57 +
 ...edrock-flow_flowconnectionconfiguration.go |    42 +
 ...ck-flow_flowdataconnectionconfiguration.go |    42 +
 .../aws-bedrock-flow_flowdefinition.go        |    42 +
 .../bedrock/aws-bedrock-flow_flownode.go      |    57 +
 .../aws-bedrock-flow_flownodeconfiguration.go |    92 +
 .../bedrock/aws-bedrock-flow_flownodeinput.go |    47 +
 .../aws-bedrock-flow_flownodeoutput.go        |    42 +
 .../aws-bedrock-flow_flowvalidation.go        |    37 +
 ...flow_knowledgebaseflownodeconfiguration.go |    42 +
 ...low_lambdafunctionflownodeconfiguration.go |    37 +
 ...s-bedrock-flow_lexflownodeconfiguration.go |    42 +
 ...edrock-flow_promptflownodeconfiguration.go |    37 +
 ...-flow_promptflownodeinlineconfiguration.go |    52 +
 ...low_promptflownoderesourceconfiguration.go |    37 +
 ...-flow_promptflownodesourceconfiguration.go |    42 +
 ...drock-flow_promptinferenceconfiguration.go |    37 +
 .../aws-bedrock-flow_promptinputvariable.go   |    37 +
 ...-flow_promptmodelinferenceconfiguration.go |    57 +
 ...edrock-flow_prompttemplateconfiguration.go |    37 +
 ...ock-flow_retrievalflownodeconfiguration.go |    37 +
 ...k-flow_retrievalflownodes3configuration.go |    37 +
 ...w_retrievalflownodeserviceconfiguration.go |    37 +
 .../bedrock/aws-bedrock-flow_s3location.go    |    47 +
 ...drock-flow_storageflownodeconfiguration.go |    37 +
 ...ock-flow_storageflownodes3configuration.go |    37 +
 ...low_storageflownodeserviceconfiguration.go |    37 +
 ...ck-flow_textprompttemplateconfiguration.go |    42 +
 .../bedrock/aws-bedrock-flowalias.go          |   137 +
 ...s_flowaliasroutingconfigurationlistitem.go |    37 +
 .../bedrock/aws-bedrock-flowversion.go        |   122 +
 ...-flowversion_agentflownodeconfiguration.go |    37 +
 ...wversion_conditionflownodeconfiguration.go |    37 +
 .../aws-bedrock-flowversion_flowcondition.go  |    42 +
 ..._flowconditionalconnectionconfiguration.go |    37 +
 .../aws-bedrock-flowversion_flowconnection.go |    57 +
 ...flowversion_flowconnectionconfiguration.go |    42 +
 ...version_flowdataconnectionconfiguration.go |    42 +
 .../aws-bedrock-flowversion_flowdefinition.go |    42 +
 .../aws-bedrock-flowversion_flownode.go       |    57 +
 ...drock-flowversion_flownodeconfiguration.go |    92 +
 .../aws-bedrock-flowversion_flownodeinput.go  |    47 +
 .../aws-bedrock-flowversion_flownodeoutput.go |    42 +
 ...sion_knowledgebaseflownodeconfiguration.go |    42 +
 ...ion_lambdafunctionflownodeconfiguration.go |    37 +
 ...ck-flowversion_lexflownodeconfiguration.go |    42 +
 ...flowversion_promptflownodeconfiguration.go |    37 +
 ...rsion_promptflownodeinlineconfiguration.go |    52 +
 ...ion_promptflownoderesourceconfiguration.go |    37 +
 ...rsion_promptflownodesourceconfiguration.go |    42 +
 ...lowversion_promptinferenceconfiguration.go |    37 +
 ...bedrock-flowversion_promptinputvariable.go |    37 +
 ...rsion_promptmodelinferenceconfiguration.go |    57 +
 ...flowversion_prompttemplateconfiguration.go |    37 +
 ...wversion_retrievalflownodeconfiguration.go |    37 +
 ...ersion_retrievalflownodes3configuration.go |    37 +
 ...n_retrievalflownodeserviceconfiguration.go |    37 +
 ...lowversion_storageflownodeconfiguration.go |    37 +
 ...wversion_storageflownodes3configuration.go |    37 +
 ...ion_storageflownodeserviceconfiguration.go |    37 +
 ...version_textprompttemplateconfiguration.go |    42 +
 .../bedrock/aws-bedrock-guardrail.go          |     5 +
 ...ardrail_contextualgroundingfilterconfig.go |    42 +
 ...ardrail_contextualgroundingpolicyconfig.go |    37 +
 .../bedrock/aws-bedrock-guardrailversion.go   |   122 +
 ...base_bedrockembeddingmodelconfiguration.go |    37 +
 ...owledgebase_embeddingmodelconfiguration.go |    37 +
 ...knowledgebase_mongodbatlasconfiguration.go |    67 +
 ...-knowledgebase_mongodbatlasfieldmapping.go |    47 +
 ...rock-knowledgebase_storageconfiguration.go |     5 +
 ...gebase_vectorknowledgebaseconfiguration.go |     5 +
 cloudformation/bedrock/aws-bedrock-prompt.go  |   142 +
 ...ock-prompt_promptinferenceconfiguration.go |    37 +
 .../aws-bedrock-prompt_promptinputvariable.go |    37 +
 ...rompt_promptmodelinferenceconfiguration.go |    57 +
 ...rock-prompt_prompttemplateconfiguration.go |    37 +
 .../aws-bedrock-prompt_promptvariant.go       |    57 +
 ...-prompt_textprompttemplateconfiguration.go |    47 +
 .../aws-bedrock-prompt_texts3location.go      |    47 +
 .../bedrock/aws-bedrock-promptversion.go      |   127 +
 ...mptversion_promptinferenceconfiguration.go |    37 +
 ...drock-promptversion_promptinputvariable.go |    37 +
 ...rsion_promptmodelinferenceconfiguration.go |    57 +
 ...omptversion_prompttemplateconfiguration.go |    37 +
 ...aws-bedrock-promptversion_promptvariant.go |    57 +
 ...version_textprompttemplateconfiguration.go |    42 +
 cloudformation/budgets/aws-budgets-budget.go  |     5 +
 .../budgets/aws-budgets-budget_resourcetag.go |    42 +
 .../budgets/aws-budgets-budgetsaction.go      |     5 +
 .../aws-budgets-budgetsaction_resourcetag.go  |    42 +
 ...tbot-microsoftteamschannelconfiguration.go |     6 +
 .../aws-chatbot-slackchannelconfiguration.go  |     6 +
 ...configuredtable_analysisruleaggregation.go |     5 +
 ...ooms-configuredtable_analysisrulecustom.go |    10 +
 ...nrooms-configuredtable_analysisrulelist.go |     5 +
 ...s-cleanrooms-configuredtableassociation.go |     5 +
 ..._configuredtableassociationanalysisrule.go |    42 +
 ...tableassociationanalysisruleaggregation.go |    42 +
 ...guredtableassociationanalysisrulecustom.go |    42 +
 ...figuredtableassociationanalysisrulelist.go |    42 +
 ...guredtableassociationanalysisrulepolicy.go |    37 +
 ...redtableassociationanalysisrulepolicyv1.go |    47 +
 .../aws-cleanrooms-idmappingtable.go          |   143 +
 ...able_idmappingtableinputreferenceconfig.go |    42 +
 ..._idmappingtableinputreferenceproperties.go |    37 +
 ...dmappingtable_idmappingtableinputsource.go |    42 +
 .../aws-cleanrooms-idnamespaceassociation.go  |   143 +
 ...-idnamespaceassociation_idmappingconfig.go |    37 +
 ...amespaceassociationinputreferenceconfig.go |    42 +
 ...paceassociationinputreferenceproperties.go |    42 +
 .../aws-cloudformation-customresource.go      |     5 +
 ...formation-stackset_operationpreferences.go |     5 +
 .../codebuild/aws-codebuild-fleet.go          |    20 +
 .../aws-codebuild-fleet_vpcconfig.go          |    47 +
 .../aws-codebuild-project_projecttriggers.go  |     5 +
 ...ws-codebuild-project_scopeconfiguration.go |    37 +
 ...codepipeline-pipeline_actiondeclaration.go |    22 +-
 .../aws-codepipeline-pipeline_actiontypeid.go |    10 +-
 ...pipeline-pipeline_beforeentryconditions.go |    37 +
 ...odepipeline-pipeline_blockerdeclaration.go |     6 +-
 .../aws-codepipeline-pipeline_condition.go    |    42 +
 ...aws-codepipeline-pipeline_encryptionkey.go |     6 +-
 ...codepipeline-pipeline_failureconditions.go |    42 +
 ...peline-pipeline_gitbranchfiltercriteria.go |     6 +-
 ...-codepipeline-pipeline_gitconfiguration.go |     8 +-
 ...line-pipeline_gitfilepathfiltercriteria.go |     6 +-
 ...epipeline-pipeline_gitpullrequestfilter.go |     8 +-
 ...aws-codepipeline-pipeline_gitpushfilter.go |     8 +-
 ...epipeline-pipeline_gittagfiltercriteria.go |     6 +-
 ...aws-codepipeline-pipeline_inputartifact.go |     4 +-
 ...ws-codepipeline-pipeline_outputartifact.go |     4 +-
 ...ine-pipeline_pipelinetriggerdeclaration.go |     6 +-
 ...s-codepipeline-pipeline_ruledeclaration.go |    62 +
 .../aws-codepipeline-pipeline_ruletypeid.go   |    52 +
 ...-codepipeline-pipeline_stagedeclaration.go |    23 +-
 ...s-codepipeline-pipeline_stagetransition.go |     6 +-
 ...codepipeline-pipeline_successconditions.go |    37 +
 ...depipeline-pipeline_variabledeclaration.go |     8 +-
 .../cognito/aws-cognito-identitypool.go       |     6 +
 ...veryconfiguration_firehoseconfiguration.go |    37 +
 ...gdeliveryconfiguration_logconfiguration.go |    10 +
 ...ogdeliveryconfiguration_s3configuration.go |    37 +
 .../cognito/aws-cognito-userpool.go           |    10 +
 ...serpool_advancedsecurityadditionalflows.go |    37 +
 .../aws-cognito-userpool_passwordpolicy.go    |     5 +
 .../aws-cognito-userpool_userpooladdons.go    |     5 +
 .../connect/aws-connect-agentstatus.go        |   153 +
 .../connect/aws-connect-rule_actions.go       |     5 +
 ...connect-rule_submitautoevaluationaction.go |    37 +
 .../aws-connect-userhierarchystructure.go     |   122 +
 ...onnect-userhierarchystructure_levelfive.go |    47 +
 ...onnect-userhierarchystructure_levelfour.go |    47 +
 ...connect-userhierarchystructure_levelone.go |    47 +
 ...nnect-userhierarchystructure_levelthree.go |    47 +
 ...connect-userhierarchystructure_leveltwo.go |    47 +
 ...erarchystructure_userhierarchystructure.go |    57 +
 .../datazone/aws-datazone-environment.go      |    19 +-
 .../aws-datazone-environmentactions.go        |   142 +
 ...ronmentactions_awsconsolelinkparameters.go |    37 +
 .../datazone/aws-datazone-groupprofile.go     |   127 +
 .../aws-datazone-projectmembership.go         |   132 +
 .../aws-datazone-projectmembership_member.go  |    42 +
 .../datazone/aws-datazone-userprofile.go      |   132 +
 ...azone-userprofile_iamuserprofiledetails.go |    37 +
 ...azone-userprofile_ssouserprofiledetails.go |    47 +
 ...datazone-userprofile_userprofiledetails.go |    42 +
 cloudformation/deadline/aws-deadline-farm.go  |     6 +
 cloudformation/deadline/aws-deadline-fleet.go |    10 +-
 .../deadline/aws-deadline-licenseendpoint.go  |     6 +
 .../deadline/aws-deadline-meteredproduct.go   |    15 -
 .../deadline/aws-deadline-monitor.go          |   132 +
 cloudformation/deadline/aws-deadline-queue.go |    10 +-
 .../deadline/aws-deadline-storageprofile.go   |     4 +-
 .../dms/aws-dms-replicationconfig.go          |    29 +-
 .../dms/aws-dms-replicationinstance.go        |     5 +
 .../dynamodb/aws-dynamodb-globaltable.go      |     5 +
 ...namodb-globaltable_globalsecondaryindex.go |     5 +
 ...baltable_readondemandthroughputsettings.go |    37 +
 ...eplicaglobalsecondaryindexspecification.go |     5 +
 ...namodb-globaltable_replicaspecification.go |     5 +
 ...altable_writeondemandthroughputsettings.go |    37 +
 cloudformation/dynamodb/aws-dynamodb-table.go |     5 +
 ...aws-dynamodb-table_globalsecondaryindex.go |     5 +
 .../aws-dynamodb-table_ondemandthroughput.go  |    42 +
 cloudformation/ec2/aws-ec2-customergateway.go |     5 +
 cloudformation/ec2/aws-ec2-instance_state.go  |    42 +
 cloudformation/ec2/aws-ec2-ipam.go            |     5 +
 cloudformation/ec2/aws-ec2-subnet.go          |     5 -
 .../ec2/aws-ec2-trafficmirrorfilterrule.go    |     6 +
 cloudformation/ec2/aws-ec2-transitgateway.go  |     5 +
 .../ec2/aws-ec2-transitgatewayroute.go        |     4 +-
 ...ec2-transitgatewayvpcattachment_options.go |     5 +
 cloudformation/ec2/aws-ec2-vpnconnection.go   |    40 +
 .../ec2/aws-ec2-vpngatewayroutepropagation.go |     6 +-
 .../ecr/aws-ecr-repositorycreationtemplate.go |     5 +
 .../aws-ecs-cluster_clusterconfiguration.go   |     5 +
 ...ecs-cluster_managedstorageconfiguration.go |    42 +
 ...-ecs-taskdefinition_containerdefinition.go |     5 +
 .../aws-ecs-taskdefinition_restartpolicy.go   |    47 +
 cloudformation/eks/aws-eks-addon.go           |     5 +
 .../aws-eks-addon_podidentityassociation.go   |    42 +
 cloudformation/eks/aws-eks-cluster.go         |    15 +
 .../eks/aws-eks-cluster_upgradepolicy.go      |    37 +
 .../eks/aws-eks-cluster_zonalshiftconfig.go   |    37 +
 .../aws-elasticache-parametergroup.go         |    10 +-
 .../aws-elasticloadbalancingv2-listener.go    |     5 +
 ...dbalancingv2-listener_listenerattribute.go |    42 +
 .../aws-emr-cluster_instancefleetconfig.go    |     5 +
 ...ter_instancefleetresizingspecifications.go |    42 +
 .../emr/aws-emr-cluster_instancetypeconfig.go |     5 +
 ...ster_ondemandcapacityreservationoptions.go |    47 +
 ...uster_ondemandprovisioningspecification.go |     5 +
 ...r-cluster_ondemandresizingspecification.go |    47 +
 ...s-emr-cluster_spotresizingspecification.go |    42 +
 .../emr/aws-emr-instancefleetconfig.go        |     5 +
 ...fig_instancefleetresizingspecifications.go |    42 +
 ...-instancefleetconfig_instancetypeconfig.go |     5 +
 ...nfig_ondemandcapacityreservationoptions.go |    47 +
 ...onfig_ondemandprovisioningspecification.go |     5 +
 ...eetconfig_ondemandresizingspecification.go |    47 +
 ...cefleetconfig_spotresizingspecification.go |    42 +
 .../aws-emrserverless-application.go          |     5 +
 ...ss-application_interactiveconfiguration.go |    42 +
 ...verless-application_workerconfiguration.go |     5 +
 ...ngworkflow_idmappingrulebasedproperties.go |    52 +
 ...n-idmappingworkflow_idmappingtechniques.go |     5 +
 ...entityresolution-idmappingworkflow_rule.go |    42 +
 ..._idnamespaceidmappingworkflowproperties.go |     5 +
 ...dnamespace_namespacerulebasedproperties.go |    52 +
 .../aws-entityresolution-idnamespace_rule.go  |    42 +
 .../aws-entityresolution-matchingworkflow.go  |     5 +
 ...n-matchingworkflow_incrementalrunconfig.go |    37 +
 ...on-matchingworkflow_rulebasedproperties.go |     5 +
 ...tion-schemamapping_schemainputattribute.go |     5 +
 cloudformation/events/aws-events-eventbus.go  |    15 +
 .../aws-events-eventbus_deadletterconfig.go   |    37 +
 .../fms/aws-fms-policy_icmptypecode.go        |    42 +
 .../aws-fms-policy_networkaclcommonpolicy.go  |    37 +
 .../fms/aws-fms-policy_networkaclentry.go     |    67 +
 .../fms/aws-fms-policy_networkaclentryset.go  |    52 +
 .../fms/aws-fms-policy_policyoption.go        |     5 +
 .../fms/aws-fms-policy_portrange.go           |    42 +
 .../aws-fsx-filesystem_lustreconfiguration.go |     5 +
 ...ws-fsx-filesystem_metadataconfiguration.go |    42 +
 ...lerator-crossaccountattachment_resource.go |     9 +-
 .../glue/aws-glue-crawler_jdbctarget.go       |     5 +
 cloudformation/glue/aws-glue-database.go      |     5 +
 .../aws-glue-database_federateddatabase.go    |     6 +-
 cloudformation/glue/aws-glue-job.go           |    15 +
 cloudformation/glue/aws-glue-usageprofile.go  |   133 +
 ...s-glue-usageprofile_configurationobject.go |    52 +
 ...-glue-usageprofile_profileconfiguration.go |    42 +
 .../guardduty/aws-guardduty-filter.go         |     8 +-
 .../aws-guardduty-malwareprotectionplan.go    |   132 +
 ...rdduty-malwareprotectionplan_cfnactions.go |    37 +
 ...wareprotectionplan_cfnprotectedresource.go |    37 +
 ...-malwareprotectionplan_cfnstatusreasons.go |    42 +
 ...rdduty-malwareprotectionplan_cfntagging.go |    37 +
 ...uardduty-malwareprotectionplan_s3bucket.go |    42 +
 ...guardduty-malwareprotectionplan_tagitem.go |    42 +
 cloudformation/iam/aws-iam-oidcprovider.go    |     4 +-
 .../aws-inspectorv2-cisscanconfiguration.go   |    16 +-
 .../iot/aws-iot-domainconfiguration.go        |    15 +
 ...inconfiguration_clientcertificateconfig.go |    37 +
 .../iotfleetwise/aws-iotfleetwise-campaign.go |     9 +-
 ...ampaign_conditionbasedsignalfetchconfig.go |    42 +
 ...leetwise-campaign_datadestinationconfig.go |     5 +
 ...s-iotfleetwise-campaign_mqtttopicconfig.go |    42 +
 ...iotfleetwise-campaign_signalfetchconfig.go |    42 +
 ...eetwise-campaign_signalfetchinformation.go |    52 +
 ...ise-campaign_timebasedsignalfetchconfig.go |    37 +
 cloudformation/ivs/aws-ivs-publickey.go       |   128 +
 cloudformation/ivs/aws-ivs-stage.go           |     5 +
 ...e_autoparticipantrecordingconfiguration.go |    42 +
 .../kinesis/aws-kinesis-resourcepolicy.go     |   122 +
 ...v2-application_applicationconfiguration.go |     5 +
 ..._applicationsystemrollbackconfiguration.go |    37 +
 .../aws-kinesisfirehose-deliverystream.go     |     5 +
 ...ose-deliverystream_catalogconfiguration.go |    37 +
 ...erystream_destinationtableconfiguration.go |    52 +
 ...am_httpendpointdestinationconfiguration.go |     5 +
 ...ystream_icebergdestinationconfiguration.go |    77 +
 ...e-deliverystream_msksourceconfiguration.go |     5 +
 ...stream_redshiftdestinationconfiguration.go |    13 +-
 ...iverystream_secretsmanagerconfiguration.go |    47 +
 ...-deliverystream_snowflakebufferinghints.go |    42 +
 ...tream_snowflakedestinationconfiguration.go |    18 +-
 ...rystream_splunkdestinationconfiguration.go |     9 +-
 ...-lambda-alias_aliasroutingconfiguration.go |     4 +-
 .../lambda/aws-lambda-codesigningconfig.go    |     6 +
 .../lambda/aws-lambda-eventsourcemapping.go   |    11 +
 cloudformation/lambda/aws-lambda-function.go  |     5 +
 .../lambda/aws-lambda-function_code.go        |     5 +
 cloudformation/lambda/aws-lambda-version.go   |     5 +
 .../aws-launchwizard-deployment.go            |   137 +
 .../aws-launchwizard-deployment_tags.go       |    42 +
 .../mediaconnect/aws-mediaconnect-flow.go     |    20 +
 .../aws-mediaconnect-flow_fmtp.go             |    67 +
 ...ws-mediaconnect-flow_inputconfiguration.go |    42 +
 .../aws-mediaconnect-flow_interface.go        |    37 +
 .../aws-mediaconnect-flow_maintenance.go      |    42 +
 .../aws-mediaconnect-flow_mediastream.go      |    72 +
 ...mediaconnect-flow_mediastreamattributes.go |    42 +
 ...ect-flow_mediastreamsourceconfiguration.go |    47 +
 .../aws-mediaconnect-flow_source.go           |    10 +
 ...ediaconnect-flow_sourcemonitoringconfig.go |    37 +
 .../aws-mediaconnect-flow_vpcinterface.go     |    62 +
 .../aws-mediaconnect-flowoutput.go            |    10 +
 ...ect-flowoutput_destinationconfiguration.go |    47 +
 ...iaconnect-flowoutput_encodingparameters.go |    42 +
 .../aws-mediaconnect-flowoutput_interface.go  |    37 +
 ...owoutput_mediastreamoutputconfiguration.go |    52 +
 ...ws-medialive-channel_availconfiguration.go |     5 +
 .../aws-medialive-channel_h264settings.go     |     5 +
 .../aws-medialive-channel_h265settings.go     |     5 +
 .../aws-medialive-channelplacementgroup.go    |   132 +
 ...ws-medialive-channelplacementgroup_tags.go |    42 +
 .../aws-medialive-cloudwatchalarmtemplate.go  |   177 +
 ...-medialive-cloudwatchalarmtemplategroup.go |   127 +
 .../medialive/aws-medialive-cluster.go        |   137 +
 ...edialive-cluster_clusternetworksettings.go |    42 +
 .../aws-medialive-cluster_interfacemapping.go |    42 +
 .../medialive/aws-medialive-cluster_tags.go   |    42 +
 .../aws-medialive-eventbridgeruletemplate.go  |   142 +
 ...etemplate_eventbridgeruletemplatetarget.go |    37 +
 ...-medialive-eventbridgeruletemplategroup.go |   127 +
 .../medialive/aws-medialive-input.go          |     5 +
 ...ialive-input_srtcallerdecryptionrequest.go |    42 +
 ...-medialive-input_srtcallersourcerequest.go |    57 +
 .../aws-medialive-input_srtsettingsrequest.go |    37 +
 .../aws-medialive-multiplexprogram.go         |     5 -
 .../medialive/aws-medialive-network.go        |   132 +
 .../medialive/aws-medialive-network_ippool.go |    37 +
 .../medialive/aws-medialive-network_route.go  |    42 +
 .../medialive/aws-medialive-network_tags.go   |    42 +
 .../medialive/aws-medialive-sdisource.go      |   132 +
 .../medialive/aws-medialive-sdisource_tags.go |    42 +
 .../medialive/aws-medialive-signalmap.go      |   147 +
 .../aws-medialive-signalmap_mediaresource.go  |    47 +
 ...dialive-signalmap_mediaresourceneighbor.go |    42 +
 ...s-medialive-signalmap_monitordeployment.go |    47 +
 ...e-signalmap_successfulmonitordeployment.go |    42 +
 .../aws-mediapackagev2-channel.go             |     5 +
 .../aws-mediapackagev2-originendpoint.go      |    14 +-
 ...riginendpoint_dashmanifestconfiguration.go |    87 +
 ...apackagev2-originendpoint_dashutctiming.go |    42 +
 ...ndpoint_forceendpointerrorconfiguration.go |    37 +
 ...-mediapackagev2-originendpoint_sctedash.go |    37 +
 ...-playbackconfiguration_availsuppression.go |     5 +
 ...cator_replicationtopicnameconfiguration.go |    37 +
 .../aws-msk-replicator_topicreplication.go    |     5 +
 cloudformation/mwaa/aws-mwaa-environment.go   |    10 +
 .../neptune/aws-neptune-eventsubscription.go  |   137 +
 ...orkfirewall-firewallpolicy_flowtimeouts.go |    37 +
 ...ll-firewallpolicy_statefulengineoptions.go |     5 +
 .../aws-networkmanager-connectattachment.go   |    10 +
 ...ment_proposednetworkfunctiongroupchange.go |    48 +
 ...network_corenetworknetworkfunctiongroup.go |    47 +
 ...aws-networkmanager-corenetwork_segments.go |    42 +
 ...-networkmanager-sitetositevpnattachment.go |    10 +
 ...ment_proposednetworkfunctiongroupchange.go |    48 +
 ...ager-transitgatewayroutetableattachment.go |    10 +
 ...ment_proposednetworkfunctiongroupchange.go |    48 +
 .../aws-networkmanager-vpcattachment.go       |     5 +
 ...ment_proposednetworkfunctiongroupchange.go |    48 +
 .../aws-opensearchservice-domain.go           |     5 +
 ...ice-domain_advancedsecurityoptionsinput.go |     5 +
 ...aws-opensearchservice-domain_jwtoptions.go |    52 +
 .../aws-osis-pipeline_vpcattachmentoptions.go |    42 +
 .../osis/aws-osis-pipeline_vpcoptions.go      |    10 +
 .../aws-pcaconnectorscep-challenge.go         |   122 +
 .../aws-pcaconnectorscep-connector.go         |   127 +
 ...ectorscep-connector_intuneconfiguration.go |    42 +
 ...orscep-connector_mobiledevicemanagement.go |    37 +
 ...ectorscep-connector_openidconfiguration.go |    47 +
 cloudformation/pipes/aws-pipes-pipe.go        |     5 +
 .../pipes/aws-pipes-pipe_dimensionmapping.go  |    47 +
 ...pipes-pipe_multimeasureattributemapping.go |    47 +
 .../aws-pipes-pipe_multimeasuremapping.go     |    42 +
 .../aws-pipes-pipe_pipetargetparameters.go    |     5 +
 ...pes-pipe_pipetargettimestreamparameters.go |    72 +
 .../aws-pipes-pipe_singlemeasuremapping.go    |    47 +
 .../qbusiness/aws-qbusiness-application.go    |   178 +
 ...ss-application_attachmentsconfiguration.go |    37 +
 ...plication_autosubscriptionconfiguration.go |    42 +
 ...ess-application_encryptionconfiguration.go |    37 +
 ...pplication_personalizationconfiguration.go |    37 +
 ...business-application_qappsconfiguration.go |    37 +
 .../qbusiness/aws-qbusiness-datasource.go     |   163 +
 ...s-datasource_datasourcevpcconfiguration.go |    42 +
 ...s-datasource_documentattributecondition.go |    47 +
 ...ness-datasource_documentattributetarget.go |    47 +
 ...iness-datasource_documentattributevalue.go |    52 +
 ...asource_documentenrichmentconfiguration.go |    47 +
 ...-qbusiness-datasource_hookconfiguration.go |    52 +
 ...e_inlinedocumentenrichmentconfiguration.go |    47 +
 .../qbusiness/aws-qbusiness-index.go          |   148 +
 ...ss-index_documentattributeconfiguration.go |    47 +
 ...siness-index_indexcapacityconfiguration.go |    37 +
 .../aws-qbusiness-index_indexstatistics.go    |    37 +
 ...-qbusiness-index_textdocumentstatistics.go |    42 +
 .../qbusiness/aws-qbusiness-plugin.go         |   153 +
 .../aws-qbusiness-plugin_apischema.go         |    42 +
 ...qbusiness-plugin_basicauthconfiguration.go |    42 +
 ...siness-plugin_custompluginconfiguration.go |    47 +
 ...gin_oauth2clientcredentialconfiguration.go |    42 +
 ...business-plugin_pluginauthconfiguration.go |    47 +
 .../qbusiness/aws-qbusiness-plugin_s3.go      |    42 +
 .../qbusiness/aws-qbusiness-retriever.go      |   143 +
 ...ness-retriever_kendraindexconfiguration.go |    37 +
 ...ness-retriever_nativeindexconfiguration.go |    37 +
 ...siness-retriever_retrieverconfiguration.go |    42 +
 .../qbusiness/aws-qbusiness-webexperience.go  |   153 +
 ...xperience_identityproviderconfiguration.go |    42 +
 ...ence_openidconnectproviderconfiguration.go |    42 +
 ...webexperience_samlproviderconfiguration.go |    37 +
 ...-quicksight-analysis_analysisdefinition.go |     5 +
 ...quicksight-analysis_categoryinnerfilter.go |    47 +
 ...s-quicksight-analysis_columntooltipitem.go |     5 +
 ...ksight-analysis_combochartconfiguration.go |     5 +
 ...sis_defaultdatetimepickercontroloptions.go |     5 +
 ...sis_defaultfilterdropdowncontroloptions.go |     5 +
 ...s_defaultrelativedatetimecontroloptions.go |     5 +
 ...ws-quicksight-analysis_fieldtooltipitem.go |     5 +
 .../aws-quicksight-analysis_filter.go         |     5 +
 ...ht-analysis_filterdatetimepickercontrol.go |     5 +
 ...icksight-analysis_filterdropdowncontrol.go |     5 +
 ...-analysis_filterrelativedatetimecontrol.go |     5 +
 .../aws-quicksight-analysis_innerfilter.go    |    37 +
 ...cksight-analysis_linechartconfiguration.go |     5 +
 .../aws-quicksight-analysis_nestedfilter.go   |    52 +
 ...sight-analysis_parameterdropdowncontrol.go |     5 +
 ...icksight-analysis_queryexecutionoptions.go |    37 +
 ...s-quicksight-analysis_singleaxisoptions.go |    37 +
 ...alysis_waterfallchartcolorconfiguration.go |    37 +
 ...ht-analysis_waterfallchartconfiguration.go |     5 +
 ...s_waterfallchartgroupcolorconfiguration.go |    47 +
 .../aws-quicksight-analysis_yaxisoptions.go   |    37 +
 ...uicksight-dashboard_categoryinnerfilter.go |    47 +
 ...-quicksight-dashboard_columntooltipitem.go |     5 +
 ...sight-dashboard_combochartconfiguration.go |     5 +
 ...ard_defaultdatetimepickercontroloptions.go |     5 +
 ...ard_defaultfilterdropdowncontroloptions.go |     5 +
 ...d_defaultrelativedatetimecontroloptions.go |     5 +
 ...s-quicksight-dashboard_fieldtooltipitem.go |     5 +
 .../aws-quicksight-dashboard_filter.go        |     5 +
 ...t-dashboard_filterdatetimepickercontrol.go |     5 +
 ...cksight-dashboard_filterdropdowncontrol.go |     5 +
 ...dashboard_filterrelativedatetimecontrol.go |     5 +
 .../aws-quicksight-dashboard_innerfilter.go   |    37 +
 ...ksight-dashboard_linechartconfiguration.go |     5 +
 .../aws-quicksight-dashboard_nestedfilter.go  |    52 +
 ...ight-dashboard_parameterdropdowncontrol.go |     5 +
 ...-quicksight-dashboard_singleaxisoptions.go |    37 +
 ...hboard_waterfallchartcolorconfiguration.go |    37 +
 ...t-dashboard_waterfallchartconfiguration.go |     5 +
 ...d_waterfallchartgroupcolorconfiguration.go |    47 +
 .../aws-quicksight-dashboard_yaxisoptions.go  |    37 +
 .../quicksight/aws-quicksight-dataset.go      |     5 +
 ...s-quicksight-dataset_incrementalrefresh.go |     4 +-
 .../aws-quicksight-dataset_logicaltable.go    |     4 +-
 .../aws-quicksight-dataset_lookbackwindow.go  |    12 +-
 ...quicksight-dataset_refreshconfiguration.go |     4 +-
 ...s-quicksight-dataset_transformoperation.go |     5 +
 ...quicksight-dataset_untagcolumnoperation.go |    42 +
 .../quicksight/aws-quicksight-datasource.go   |     8 +-
 ...-datasource_identitycenterconfiguration.go |    37 +
 ...ksight-datasource_redshiftiamparameters.go |    52 +
 ...uicksight-datasource_redshiftparameters.go |    10 +
 ...uicksight-datasource_resourcepermission.go |     5 +
 .../quicksight/aws-quicksight-folder.go       |   153 +
 ...ws-quicksight-folder_resourcepermission.go |    42 +
 ...quicksight-template_categoryinnerfilter.go |    47 +
 ...s-quicksight-template_columntooltipitem.go |     5 +
 ...ksight-template_combochartconfiguration.go |     5 +
 ...ate_defaultdatetimepickercontroloptions.go |     5 +
 ...ate_defaultfilterdropdowncontroloptions.go |     5 +
 ...e_defaultrelativedatetimecontroloptions.go |     5 +
 ...ws-quicksight-template_fieldtooltipitem.go |     5 +
 .../aws-quicksight-template_filter.go         |     5 +
 ...ht-template_filterdatetimepickercontrol.go |     5 +
 ...icksight-template_filterdropdowncontrol.go |     5 +
 ...-template_filterrelativedatetimecontrol.go |     5 +
 .../aws-quicksight-template_innerfilter.go    |    37 +
 ...cksight-template_linechartconfiguration.go |     5 +
 .../aws-quicksight-template_nestedfilter.go   |    52 +
 ...sight-template_parameterdropdowncontrol.go |     5 +
 ...icksight-template_queryexecutionoptions.go |    37 +
 ...s-quicksight-template_singleaxisoptions.go |    37 +
 ...ight-template_templateversiondefinition.go |     5 +
 ...mplate_waterfallchartcolorconfiguration.go |    37 +
 ...ht-template_waterfallchartconfiguration.go |     5 +
 ...e_waterfallchartgroupcolorconfiguration.go |    47 +
 .../aws-quicksight-template_yaxisoptions.go   |    37 +
 ...s-quicksight-topic_topiccalculatedfield.go |     5 +
 .../aws-quicksight-topic_topiccolumn.go       |     5 +
 cloudformation/rds/aws-rds-dbcluster.go       |    10 +
 cloudformation/rds/aws-rds-dbinstance.go      |     5 +
 cloudformation/rds/aws-rds-globalcluster.go   |    11 +
 .../aws-redshift-cluster_loggingproperties.go |    10 +
 .../aws-rolesanywhere-profile.go              |    10 +
 ...-rolesanywhere-profile_attributemapping.go |    42 +
 .../aws-rolesanywhere-profile_mappingrule.go  |    37 +
 ...resolver-firewallrulegroup_firewallrule.go |     5 +
 .../aws-route53resolver-resolverrule.go       |     9 +-
 .../aws-s3-bucket_lifecycleconfiguration.go   |     5 +
 .../aws-s3express-directorybucket.go          |     5 +
 ...xpress-directorybucket_bucketencryption.go |    37 +
 ...orybucket_serversideencryptionbydefault.go |    42 +
 ...irectorybucket_serversideencryptionrule.go |    42 +
 .../aws-sagemaker-app_resourcespec.go         |     5 +
 .../sagemaker/aws-sagemaker-cluster.go        |   143 +
 ...agemaker-cluster_clusterebsvolumeconfig.go |    37 +
 ...-sagemaker-cluster_clusterinstancegroup.go |    77 +
 ...er-cluster_clusterinstancestorageconfig.go |    37 +
 ...agemaker-cluster_clusterlifecycleconfig.go |    42 +
 ...er-cluster_clusterorchestratoreksconfig.go |    37 +
 .../aws-sagemaker-cluster_orchestrator.go     |    37 +
 .../aws-sagemaker-cluster_vpcconfig.go        |    42 +
 ...sagemaker-domain_applifecyclemanagement.go |    37 +
 ...-sagemaker-domain_codeeditorappsettings.go |     5 +
 ...s-sagemaker-domain_defaultspacesettings.go |    20 +
 .../aws-sagemaker-domain_idlesettings.go      |    52 +
 ...-sagemaker-domain_jupyterlabappsettings.go |     5 +
 ...gemaker-domain_jupyterserverappsettings.go |     5 +
 ...gemaker-domain_kernelgatewayappsettings.go |     5 +
 ...agemaker-domain_studiowebportalsettings.go |    42 +
 .../aws-sagemaker-domain_usersettings.go      |     5 +
 .../sagemaker/aws-sagemaker-imageversion.go   |     5 +
 .../aws-sagemaker-mlflowtrackingserver.go     |   153 +
 ...gemaker-model_additionalmodeldatasource.go |    42 +
 .../aws-sagemaker-model_hubaccessconfig.go    |    37 +
 .../aws-sagemaker-model_modelaccessconfig.go  |     4 +-
 .../aws-sagemaker-model_s3datasource.go       |    15 +-
 .../sagemaker/aws-sagemaker-modelpackage.go   |    15 +
 ...agemaker-modelpackage_modelaccessconfig.go |    37 +
 .../aws-sagemaker-modelpackage_modelcard.go   |    42 +
 ...-sagemaker-modelpackage_modeldatasource.go |    37 +
 ...package_modelpackagecontainerdefinition.go |     5 +
 ...agemaker-modelpackage_s3modeldatasource.go |    52 +
 ...s-sagemaker-modelpackage_securityconfig.go |    37 +
 ...agemaker-space_jupyterserverappsettings.go |     5 +
 ...agemaker-space_kernelgatewayappsettings.go |     5 +
 .../aws-sagemaker-space_resourcespec.go       |     5 +
 ...maker-space_spaceapplifecyclemanagement.go |    37 +
 ...emaker-space_spacecodeeditorappsettings.go |     5 +
 .../aws-sagemaker-space_spaceidlesettings.go  |    37 +
 ...emaker-space_spacejupyterlabappsettings.go |     5 +
 .../aws-sagemaker-studiolifecycleconfig.go    |   133 +
 ...aker-userprofile_applifecyclemanagement.go |    37 +
 ...maker-userprofile_codeeditorappsettings.go |     5 +
 .../aws-sagemaker-userprofile_idlesettings.go |    52 +
 ...maker-userprofile_jupyterlabappsettings.go |     5 +
 ...er-userprofile_jupyterserverappsettings.go |     5 +
 ...er-userprofile_kernelgatewayappsettings.go |     5 +
 .../aws-sagemaker-userprofile_resourcespec.go |     5 +
 ...ker-userprofile_studiowebportalsettings.go |    42 +
 .../aws-sagemaker-userprofile_usersettings.go |     5 +
 .../aws-securityhub-automationrule.go         |    20 +-
 .../aws-securityhub-configurationpolicy.go    |   132 +
 ...figurationpolicy_parameterconfiguration.go |    42 +
 ...yhub-configurationpolicy_parametervalue.go |    72 +
 ...-securityhub-configurationpolicy_policy.go |    37 +
 ...onpolicy_securitycontrolcustomparameter.go |    42 +
 ...ionpolicy_securitycontrolsconfiguration.go |    47 +
 ...b-configurationpolicy_securityhubpolicy.go |    47 +
 .../aws-securityhub-findingaggregator.go      |   122 +
 ...s-securityhub-organizationconfiguration.go |   127 +
 .../aws-securityhub-policyassociation.go      |   127 +
 .../aws-securityhub-securitycontrol.go        |   132 +
 ...-securitycontrol_parameterconfiguration.go |    42 +
 ...urityhub-securitycontrol_parametervalue.go |    72 +
 ...aws-securitylake-subscribernotification.go |   122 +
 ...fication_httpsnotificationconfiguration.go |    57 +
 ...rnotification_notificationconfiguration.go |    42 +
 ...eventdestination_eventbridgedestination.go |    37 +
 ...ionseteventdestination_eventdestination.go |     5 +
 .../ses/aws-ses-mailmanageraddoninstance.go   |   123 +
 .../aws-ses-mailmanageraddonsubscription.go   |   123 +
 .../ses/aws-ses-mailmanagerarchive.go         |   133 +
 ...ses-mailmanagerarchive_archiveretention.go |    37 +
 .../ses/aws-ses-mailmanageringresspoint.go    |   148 +
 ...ringresspoint_ingresspointconfiguration.go |    42 +
 .../ses/aws-ses-mailmanagerrelay.go           |   138 +
 ...es-mailmanagerrelay_relayauthentication.go |    42 +
 .../ses/aws-ses-mailmanagerruleset.go         |   128 +
 ...-ses-mailmanagerruleset_addheaderaction.go |    42 +
 .../aws-ses-mailmanagerruleset_analysis.go    |    42 +
 ...ws-ses-mailmanagerruleset_archiveaction.go |    42 +
 ...ilmanagerruleset_delivertomailboxaction.go |    47 +
 .../aws-ses-mailmanagerruleset_relayaction.go |    47 +
 ...ilmanagerruleset_replacerecipientaction.go |    37 +
 .../ses/aws-ses-mailmanagerruleset_rule.go    |    52 +
 .../aws-ses-mailmanagerruleset_ruleaction.go  |    72 +
 ...ailmanagerruleset_rulebooleanexpression.go |    42 +
 ...ailmanagerruleset_rulebooleantoevaluate.go |    37 +
 ...ws-ses-mailmanagerruleset_rulecondition.go |    62 +
 ...-mailmanagerruleset_ruledmarcexpression.go |    42 +
 ...ses-mailmanagerruleset_ruleipexpression.go |    47 +
 ...ses-mailmanagerruleset_ruleiptoevaluate.go |    37 +
 ...mailmanagerruleset_rulenumberexpression.go |    47 +
 ...mailmanagerruleset_rulenumbertoevaluate.go |    37 +
 ...mailmanagerruleset_rulestringexpression.go |    47 +
 ...mailmanagerruleset_rulestringtoevaluate.go |    42 +
 ...ailmanagerruleset_ruleverdictexpression.go |    47 +
 ...ailmanagerruleset_ruleverdicttoevaluate.go |    42 +
 .../aws-ses-mailmanagerruleset_s3action.go    |    57 +
 .../aws-ses-mailmanagerruleset_sendaction.go  |    42 +
 .../ses/aws-ses-mailmanagertrafficpolicy.go   |   138 +
 ...ailmanagertrafficpolicy_ingressanalysis.go |    42 +
 ...rtrafficpolicy_ingressbooleanexpression.go |    42 +
 ...rtrafficpolicy_ingressbooleantoevaluate.go |    37 +
 ...anagertrafficpolicy_ingressiptoevaluate.go |    37 +
 ...agertrafficpolicy_ingressipv4expression.go |    47 +
 ...ertrafficpolicy_ingressstringexpression.go |    47 +
 ...ertrafficpolicy_ingressstringtoevaluate.go |    37 +
 ...fficpolicy_ingresstlsprotocolexpression.go |    47 +
 ...fficpolicy_ingresstlsprotocoltoevaluate.go |    37 +
 ...ailmanagertrafficpolicy_policycondition.go |    52 +
 ...ailmanagertrafficpolicy_policystatement.go |    42 +
 .../ses/aws-ses-receiptrule_s3action.go       |     5 +
 cloudformation/sns/aws-sns-subscription.go    |     6 +-
 .../aws-ssmquicksetup-configurationmanager.go |   132 +
 ...gurationmanager_configurationdefinition.go |    62 +
 ...etup-configurationmanager_statussummary.go |    57 +
 cloudformation/sso/aws-sso-application.go     |   148 +
 ...-application_portaloptionsconfiguration.go |    42 +
 .../sso/aws-sso-application_signinoptions.go  |    42 +
 .../sso/aws-sso-applicationassignment.go      |   127 +
 cloudformation/sso/aws-sso-instance.go        |   123 +
 .../aws-stepfunctions-activity.go             |     5 +
 ...ctions-activity_encryptionconfiguration.go |    47 +
 .../aws-stepfunctions-statemachine.go         |     5 +
 ...ns-statemachine_encryptionconfiguration.go |    47 +
 .../synthetics/aws-synthetics-canary.go       |     5 +
 .../aws-systemsmanagersap-application.go      |     5 +
 .../transfer/aws-transfer-connector.go        |     5 +
 ...ws-transfer-workflow_decryptstepdetails.go |     8 +-
 ...ntitysource_identitysourceconfiguration.go |     9 +-
 ...e_openidconnectaccesstokenconfiguration.go |    42 +
 ...entitysource_openidconnectconfiguration.go |    52 +
 ...ysource_openidconnectgroupconfiguration.go |    42 +
 ...openidconnectidentitytokenconfiguration.go |    42 +
 ...ntitysource_openidconnecttokenselection.go |    42 +
 .../aws-workspaces-workspacespool.go          |   153 +
 ...aces-workspacespool_applicationsettings.go |    42 +
 .../aws-workspaces-workspacespool_capacity.go |    37 +
 ...rkspaces-workspacespool_timeoutsettings.go |    47 +
 .../aws-workspacesthinclient-environment.go   |     5 +
 .../aws-workspacesweb-identityprovider.go     |     6 +
 .../aws-workspacesweb-usersettings.go         |     5 +
 schema/cdk.go                                 | 26329 ++++++++++++----
 schema/cdk.schema.json                        | 26329 ++++++++++++----
 schema/cloudformation.go                      | 22621 ++++++++++---
 schema/cloudformation.schema.json             | 22621 ++++++++++---
 schema/sam.go                                 | 22621 ++++++++++---
 schema/sam.schema.json                        | 22621 ++++++++++---
 778 files changed, 143873 insertions(+), 31355 deletions(-)
 create mode 100644 cloudformation/amplify/aws-amplify-app_cacheconfig.go
 create mode 100644 cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparametermap.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_calendarinterval.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_dimension.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_goal.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_interval.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metric.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricdataquery.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricstat.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_monitoredrequestcountmetric.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedsli.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedslimetric.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_rollinginterval.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_sli.go
 create mode 100644 cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_slimetric.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_batch.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_cloudformationaction.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_compareaction.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_databasecdc.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_dataset.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_filemetadata.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_input.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_inputfile.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_m2managedactionproperties.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_m2managedapplicationaction.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_m2nonmanagedapplicationaction.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_mainframeaction.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_mainframeactionproperties.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_mainframeactiontype.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_output.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_outputfile.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_resourceaction.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_script.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_sourcedatabasemetadata.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_step.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_stepaction.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_targetdatabasemetadata.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_testcaselatestversion.go
 create mode 100644 cloudformation/apptest/aws-apptest-testcase_tn3270.go
 create mode 100644 cloudformation/arczonalshift/aws-arczonalshift-autoshiftobservernotificationstatus.go
 create mode 100644 cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricdataquery.go
 create mode 100644 cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricstat.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-partnership_capabilityoptions.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-partnership_outboundedioptions.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-partnership_x12delimiters.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-partnership_x12envelope.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-partnership_x12functionalgroupheaders.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-partnership_x12interchangecontrolheaders.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-partnership_x12outboundediheaders.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-transformer_formatoptions.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-transformer_inputconversion.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-transformer_mapping.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-transformer_outputconversion.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-transformer_sampledocumentkeys.go
 create mode 100644 cloudformation/b2bi/aws-b2bi-transformer_sampledocuments.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-agent_function.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-agent_functionschema.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-agent_guardrailconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-agent_parameterdetail.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_bedrockfoundationmodelconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_confluencecrawlerconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_confluencedatasourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_confluencesourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_crawlfilterconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_customtransformationconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkingconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkinglevelconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_intermediatestorage.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_parsingconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_parsingprompt.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilter.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilterconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_s3location.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_salesforcecrawlerconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_salesforcedatasourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_salesforcesourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_seedurl.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_semanticchunkingconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_sharepointcrawlerconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_sharepointdatasourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_sharepointsourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_transformation.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_transformationfunction.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_transformationlambdaconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_urlconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_webcrawlerconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_webcrawlerlimits.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_webdatasourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-datasource_websourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_agentflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_conditionflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flowcondition.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flowconditionalconnectionconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flowconnection.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flowconnectionconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flowdataconnectionconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flowdefinition.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flownode.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flownodeinput.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flownodeoutput.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_flowvalidation.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_knowledgebaseflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_lambdafunctionflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_lexflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_promptflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_promptflownodeinlineconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_promptflownoderesourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_promptflownodesourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_promptinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_promptinputvariable.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_promptmodelinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_prompttemplateconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_retrievalflownodes3configuration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeserviceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_s3location.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_storageflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_storageflownodes3configuration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_storageflownodeserviceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flow_textprompttemplateconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowalias.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowalias_flowaliasroutingconfigurationlistitem.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_agentflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_conditionflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flowcondition.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flowconditionalconnectionconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flowconnection.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flowconnectionconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flowdataconnectionconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flowdefinition.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flownode.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flownodeinput.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_flownodeoutput.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_knowledgebaseflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_lambdafunctionflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_lexflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeinlineconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_promptflownoderesourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_promptflownodesourceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_promptinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_promptinputvariable.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_promptmodelinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_prompttemplateconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodes3configuration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeserviceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_storageflownodes3configuration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeserviceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-flowversion_textprompttemplateconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingfilterconfig.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingpolicyconfig.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-guardrailversion.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-knowledgebase_bedrockembeddingmodelconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-knowledgebase_embeddingmodelconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasfieldmapping.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt_promptinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt_promptinputvariable.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt_promptmodelinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt_prompttemplateconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt_promptvariant.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt_textprompttemplateconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-prompt_texts3location.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-promptversion.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-promptversion_promptinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-promptversion_promptinputvariable.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-promptversion_promptmodelinferenceconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-promptversion_prompttemplateconfiguration.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-promptversion_promptvariant.go
 create mode 100644 cloudformation/bedrock/aws-bedrock-promptversion_textprompttemplateconfiguration.go
 create mode 100644 cloudformation/budgets/aws-budgets-budget_resourcetag.go
 create mode 100644 cloudformation/budgets/aws-budgets-budgetsaction_resourcetag.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrule.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisruleaggregation.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulecustom.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulelist.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicy.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicyv1.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idmappingtable.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceconfig.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceproperties.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputsource.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idmappingconfig.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceconfig.go
 create mode 100644 cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceproperties.go
 create mode 100644 cloudformation/codebuild/aws-codebuild-fleet_vpcconfig.go
 create mode 100644 cloudformation/codebuild/aws-codebuild-project_scopeconfiguration.go
 create mode 100644 cloudformation/codepipeline/aws-codepipeline-pipeline_beforeentryconditions.go
 create mode 100644 cloudformation/codepipeline/aws-codepipeline-pipeline_condition.go
 create mode 100644 cloudformation/codepipeline/aws-codepipeline-pipeline_failureconditions.go
 create mode 100644 cloudformation/codepipeline/aws-codepipeline-pipeline_ruledeclaration.go
 create mode 100644 cloudformation/codepipeline/aws-codepipeline-pipeline_ruletypeid.go
 create mode 100644 cloudformation/codepipeline/aws-codepipeline-pipeline_successconditions.go
 create mode 100644 cloudformation/cognito/aws-cognito-logdeliveryconfiguration_firehoseconfiguration.go
 create mode 100644 cloudformation/cognito/aws-cognito-logdeliveryconfiguration_s3configuration.go
 create mode 100644 cloudformation/cognito/aws-cognito-userpool_advancedsecurityadditionalflows.go
 create mode 100644 cloudformation/connect/aws-connect-agentstatus.go
 create mode 100644 cloudformation/connect/aws-connect-rule_submitautoevaluationaction.go
 create mode 100644 cloudformation/connect/aws-connect-userhierarchystructure.go
 create mode 100644 cloudformation/connect/aws-connect-userhierarchystructure_levelfive.go
 create mode 100644 cloudformation/connect/aws-connect-userhierarchystructure_levelfour.go
 create mode 100644 cloudformation/connect/aws-connect-userhierarchystructure_levelone.go
 create mode 100644 cloudformation/connect/aws-connect-userhierarchystructure_levelthree.go
 create mode 100644 cloudformation/connect/aws-connect-userhierarchystructure_leveltwo.go
 create mode 100644 cloudformation/connect/aws-connect-userhierarchystructure_userhierarchystructure.go
 create mode 100644 cloudformation/datazone/aws-datazone-environmentactions.go
 create mode 100644 cloudformation/datazone/aws-datazone-environmentactions_awsconsolelinkparameters.go
 create mode 100644 cloudformation/datazone/aws-datazone-groupprofile.go
 create mode 100644 cloudformation/datazone/aws-datazone-projectmembership.go
 create mode 100644 cloudformation/datazone/aws-datazone-projectmembership_member.go
 create mode 100644 cloudformation/datazone/aws-datazone-userprofile.go
 create mode 100644 cloudformation/datazone/aws-datazone-userprofile_iamuserprofiledetails.go
 create mode 100644 cloudformation/datazone/aws-datazone-userprofile_ssouserprofiledetails.go
 create mode 100644 cloudformation/datazone/aws-datazone-userprofile_userprofiledetails.go
 create mode 100644 cloudformation/deadline/aws-deadline-monitor.go
 create mode 100644 cloudformation/dynamodb/aws-dynamodb-globaltable_readondemandthroughputsettings.go
 create mode 100644 cloudformation/dynamodb/aws-dynamodb-globaltable_writeondemandthroughputsettings.go
 create mode 100644 cloudformation/dynamodb/aws-dynamodb-table_ondemandthroughput.go
 create mode 100644 cloudformation/ec2/aws-ec2-instance_state.go
 create mode 100644 cloudformation/ecs/aws-ecs-cluster_managedstorageconfiguration.go
 create mode 100644 cloudformation/ecs/aws-ecs-taskdefinition_restartpolicy.go
 create mode 100644 cloudformation/eks/aws-eks-addon_podidentityassociation.go
 create mode 100644 cloudformation/eks/aws-eks-cluster_upgradepolicy.go
 create mode 100644 cloudformation/eks/aws-eks-cluster_zonalshiftconfig.go
 create mode 100644 cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_listenerattribute.go
 create mode 100644 cloudformation/emr/aws-emr-cluster_instancefleetresizingspecifications.go
 create mode 100644 cloudformation/emr/aws-emr-cluster_ondemandcapacityreservationoptions.go
 create mode 100644 cloudformation/emr/aws-emr-cluster_ondemandresizingspecification.go
 create mode 100644 cloudformation/emr/aws-emr-cluster_spotresizingspecification.go
 create mode 100644 cloudformation/emr/aws-emr-instancefleetconfig_instancefleetresizingspecifications.go
 create mode 100644 cloudformation/emr/aws-emr-instancefleetconfig_ondemandcapacityreservationoptions.go
 create mode 100644 cloudformation/emr/aws-emr-instancefleetconfig_ondemandresizingspecification.go
 create mode 100644 cloudformation/emr/aws-emr-instancefleetconfig_spotresizingspecification.go
 create mode 100644 cloudformation/emrserverless/aws-emrserverless-application_interactiveconfiguration.go
 create mode 100644 cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingrulebasedproperties.go
 create mode 100644 cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_rule.go
 create mode 100644 cloudformation/entityresolution/aws-entityresolution-idnamespace_namespacerulebasedproperties.go
 create mode 100644 cloudformation/entityresolution/aws-entityresolution-idnamespace_rule.go
 create mode 100644 cloudformation/entityresolution/aws-entityresolution-matchingworkflow_incrementalrunconfig.go
 create mode 100644 cloudformation/events/aws-events-eventbus_deadletterconfig.go
 create mode 100644 cloudformation/fms/aws-fms-policy_icmptypecode.go
 create mode 100644 cloudformation/fms/aws-fms-policy_networkaclcommonpolicy.go
 create mode 100644 cloudformation/fms/aws-fms-policy_networkaclentry.go
 create mode 100644 cloudformation/fms/aws-fms-policy_networkaclentryset.go
 create mode 100644 cloudformation/fms/aws-fms-policy_portrange.go
 create mode 100644 cloudformation/fsx/aws-fsx-filesystem_metadataconfiguration.go
 create mode 100644 cloudformation/glue/aws-glue-usageprofile.go
 create mode 100644 cloudformation/glue/aws-glue-usageprofile_configurationobject.go
 create mode 100644 cloudformation/glue/aws-glue-usageprofile_profileconfiguration.go
 create mode 100644 cloudformation/guardduty/aws-guardduty-malwareprotectionplan.go
 create mode 100644 cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnactions.go
 create mode 100644 cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnprotectedresource.go
 create mode 100644 cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnstatusreasons.go
 create mode 100644 cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfntagging.go
 create mode 100644 cloudformation/guardduty/aws-guardduty-malwareprotectionplan_s3bucket.go
 create mode 100644 cloudformation/guardduty/aws-guardduty-malwareprotectionplan_tagitem.go
 create mode 100644 cloudformation/iot/aws-iot-domainconfiguration_clientcertificateconfig.go
 create mode 100644 cloudformation/iotfleetwise/aws-iotfleetwise-campaign_conditionbasedsignalfetchconfig.go
 create mode 100644 cloudformation/iotfleetwise/aws-iotfleetwise-campaign_mqtttopicconfig.go
 create mode 100644 cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchconfig.go
 create mode 100644 cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchinformation.go
 create mode 100644 cloudformation/iotfleetwise/aws-iotfleetwise-campaign_timebasedsignalfetchconfig.go
 create mode 100644 cloudformation/ivs/aws-ivs-publickey.go
 create mode 100644 cloudformation/ivs/aws-ivs-stage_autoparticipantrecordingconfiguration.go
 create mode 100644 cloudformation/kinesis/aws-kinesis-resourcepolicy.go
 create mode 100644 cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsystemrollbackconfiguration.go
 create mode 100644 cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_catalogconfiguration.go
 create mode 100644 cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_destinationtableconfiguration.go
 create mode 100644 cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_icebergdestinationconfiguration.go
 create mode 100644 cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_secretsmanagerconfiguration.go
 create mode 100644 cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakebufferinghints.go
 create mode 100644 cloudformation/launchwizard/aws-launchwizard-deployment.go
 create mode 100644 cloudformation/launchwizard/aws-launchwizard-deployment_tags.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_fmtp.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_inputconfiguration.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_interface.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_maintenance.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_mediastream.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamattributes.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamsourceconfiguration.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_sourcemonitoringconfig.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flow_vpcinterface.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flowoutput_destinationconfiguration.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encodingparameters.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flowoutput_interface.go
 create mode 100644 cloudformation/mediaconnect/aws-mediaconnect-flowoutput_mediastreamoutputconfiguration.go
 create mode 100644 cloudformation/medialive/aws-medialive-channelplacementgroup.go
 create mode 100644 cloudformation/medialive/aws-medialive-channelplacementgroup_tags.go
 create mode 100644 cloudformation/medialive/aws-medialive-cloudwatchalarmtemplate.go
 create mode 100644 cloudformation/medialive/aws-medialive-cloudwatchalarmtemplategroup.go
 create mode 100644 cloudformation/medialive/aws-medialive-cluster.go
 create mode 100644 cloudformation/medialive/aws-medialive-cluster_clusternetworksettings.go
 create mode 100644 cloudformation/medialive/aws-medialive-cluster_interfacemapping.go
 create mode 100644 cloudformation/medialive/aws-medialive-cluster_tags.go
 create mode 100644 cloudformation/medialive/aws-medialive-eventbridgeruletemplate.go
 create mode 100644 cloudformation/medialive/aws-medialive-eventbridgeruletemplate_eventbridgeruletemplatetarget.go
 create mode 100644 cloudformation/medialive/aws-medialive-eventbridgeruletemplategroup.go
 create mode 100644 cloudformation/medialive/aws-medialive-input_srtcallerdecryptionrequest.go
 create mode 100644 cloudformation/medialive/aws-medialive-input_srtcallersourcerequest.go
 create mode 100644 cloudformation/medialive/aws-medialive-input_srtsettingsrequest.go
 create mode 100644 cloudformation/medialive/aws-medialive-network.go
 create mode 100644 cloudformation/medialive/aws-medialive-network_ippool.go
 create mode 100644 cloudformation/medialive/aws-medialive-network_route.go
 create mode 100644 cloudformation/medialive/aws-medialive-network_tags.go
 create mode 100644 cloudformation/medialive/aws-medialive-sdisource.go
 create mode 100644 cloudformation/medialive/aws-medialive-sdisource_tags.go
 create mode 100644 cloudformation/medialive/aws-medialive-signalmap.go
 create mode 100644 cloudformation/medialive/aws-medialive-signalmap_mediaresource.go
 create mode 100644 cloudformation/medialive/aws-medialive-signalmap_mediaresourceneighbor.go
 create mode 100644 cloudformation/medialive/aws-medialive-signalmap_monitordeployment.go
 create mode 100644 cloudformation/medialive/aws-medialive-signalmap_successfulmonitordeployment.go
 create mode 100644 cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashmanifestconfiguration.go
 create mode 100644 cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashutctiming.go
 create mode 100644 cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_forceendpointerrorconfiguration.go
 create mode 100644 cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_sctedash.go
 create mode 100644 cloudformation/msk/aws-msk-replicator_replicationtopicnameconfiguration.go
 create mode 100644 cloudformation/neptune/aws-neptune-eventsubscription.go
 create mode 100644 cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_flowtimeouts.go
 create mode 100644 cloudformation/networkmanager/aws-networkmanager-connectattachment_proposednetworkfunctiongroupchange.go
 create mode 100644 cloudformation/networkmanager/aws-networkmanager-corenetwork_corenetworknetworkfunctiongroup.go
 create mode 100644 cloudformation/networkmanager/aws-networkmanager-corenetwork_segments.go
 create mode 100644 cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment_proposednetworkfunctiongroupchange.go
 create mode 100644 cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment_proposednetworkfunctiongroupchange.go
 create mode 100644 cloudformation/networkmanager/aws-networkmanager-vpcattachment_proposednetworkfunctiongroupchange.go
 create mode 100644 cloudformation/opensearchservice/aws-opensearchservice-domain_jwtoptions.go
 create mode 100644 cloudformation/osis/aws-osis-pipeline_vpcattachmentoptions.go
 create mode 100644 cloudformation/pcaconnectorscep/aws-pcaconnectorscep-challenge.go
 create mode 100644 cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector.go
 create mode 100644 cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_intuneconfiguration.go
 create mode 100644 cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_mobiledevicemanagement.go
 create mode 100644 cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_openidconfiguration.go
 create mode 100644 cloudformation/pipes/aws-pipes-pipe_dimensionmapping.go
 create mode 100644 cloudformation/pipes/aws-pipes-pipe_multimeasureattributemapping.go
 create mode 100644 cloudformation/pipes/aws-pipes-pipe_multimeasuremapping.go
 create mode 100644 cloudformation/pipes/aws-pipes-pipe_pipetargettimestreamparameters.go
 create mode 100644 cloudformation/pipes/aws-pipes-pipe_singlemeasuremapping.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-application.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-application_attachmentsconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-application_autosubscriptionconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-application_encryptionconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-application_personalizationconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-application_qappsconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource_datasourcevpcconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource_documentattributecondition.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource_documentattributetarget.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource_documentattributevalue.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource_documentenrichmentconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource_hookconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-datasource_inlinedocumentenrichmentconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-index.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-index_documentattributeconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-index_indexcapacityconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-index_indexstatistics.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-index_textdocumentstatistics.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-plugin.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-plugin_apischema.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-plugin_basicauthconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-plugin_custompluginconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-plugin_oauth2clientcredentialconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-plugin_pluginauthconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-plugin_s3.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-retriever.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-retriever_kendraindexconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-retriever_nativeindexconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-retriever_retrieverconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-webexperience.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-webexperience_identityproviderconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-webexperience_openidconnectproviderconfiguration.go
 create mode 100644 cloudformation/qbusiness/aws-qbusiness-webexperience_samlproviderconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_categoryinnerfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_innerfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_nestedfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_queryexecutionoptions.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_singleaxisoptions.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_waterfallchartcolorconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_waterfallchartgroupcolorconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-analysis_yaxisoptions.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_categoryinnerfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_innerfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_nestedfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_singleaxisoptions.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartcolorconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartgroupcolorconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dashboard_yaxisoptions.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-dataset_untagcolumnoperation.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-datasource_identitycenterconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-datasource_redshiftiamparameters.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-folder.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-folder_resourcepermission.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_categoryinnerfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_innerfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_nestedfilter.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_queryexecutionoptions.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_singleaxisoptions.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_waterfallchartcolorconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_waterfallchartgroupcolorconfiguration.go
 create mode 100644 cloudformation/quicksight/aws-quicksight-template_yaxisoptions.go
 create mode 100644 cloudformation/rolesanywhere/aws-rolesanywhere-profile_attributemapping.go
 create mode 100644 cloudformation/rolesanywhere/aws-rolesanywhere-profile_mappingrule.go
 create mode 100644 cloudformation/s3express/aws-s3express-directorybucket_bucketencryption.go
 create mode 100644 cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionbydefault.go
 create mode 100644 cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionrule.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster_clusterebsvolumeconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancegroup.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancestorageconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster_clusterlifecycleconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster_clusterorchestratoreksconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster_orchestrator.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-cluster_vpcconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-domain_applifecyclemanagement.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-domain_idlesettings.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-domain_studiowebportalsettings.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-mlflowtrackingserver.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-model_additionalmodeldatasource.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-model_hubaccessconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-modelpackage_modelaccessconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-modelpackage_modelcard.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-modelpackage_modeldatasource.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-modelpackage_s3modeldatasource.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-modelpackage_securityconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-space_spaceapplifecyclemanagement.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-space_spaceidlesettings.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-studiolifecycleconfig.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-userprofile_applifecyclemanagement.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-userprofile_idlesettings.go
 create mode 100644 cloudformation/sagemaker/aws-sagemaker-userprofile_studiowebportalsettings.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-configurationpolicy.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-configurationpolicy_parameterconfiguration.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-configurationpolicy_parametervalue.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-configurationpolicy_policy.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolcustomparameter.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolsconfiguration.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-configurationpolicy_securityhubpolicy.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-findingaggregator.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-organizationconfiguration.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-policyassociation.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-securitycontrol.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-securitycontrol_parameterconfiguration.go
 create mode 100644 cloudformation/securityhub/aws-securityhub-securitycontrol_parametervalue.go
 create mode 100644 cloudformation/securitylake/aws-securitylake-subscribernotification.go
 create mode 100644 cloudformation/securitylake/aws-securitylake-subscribernotification_httpsnotificationconfiguration.go
 create mode 100644 cloudformation/securitylake/aws-securitylake-subscribernotification_notificationconfiguration.go
 create mode 100644 cloudformation/ses/aws-ses-configurationseteventdestination_eventbridgedestination.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanageraddoninstance.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanageraddonsubscription.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerarchive.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerarchive_archiveretention.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanageringresspoint.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanageringresspoint_ingresspointconfiguration.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerrelay.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerrelay_relayauthentication.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_addheaderaction.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_analysis.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_archiveaction.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_delivertomailboxaction.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_relayaction.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_replacerecipientaction.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rule.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_ruleaction.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleanexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleantoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rulecondition.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_ruledmarcexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_ruleipexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_ruleiptoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rulenumberexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rulenumbertoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rulestringexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_rulestringtoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdictexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdicttoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_s3action.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagerruleset_sendaction.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressanalysis.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleanexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleantoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressiptoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressipv4expression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringtoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocolexpression.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocoltoevaluate.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policycondition.go
 create mode 100644 cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policystatement.go
 create mode 100644 cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager.go
 create mode 100644 cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager_configurationdefinition.go
 create mode 100644 cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager_statussummary.go
 create mode 100644 cloudformation/sso/aws-sso-application.go
 create mode 100644 cloudformation/sso/aws-sso-application_portaloptionsconfiguration.go
 create mode 100644 cloudformation/sso/aws-sso-application_signinoptions.go
 create mode 100644 cloudformation/sso/aws-sso-applicationassignment.go
 create mode 100644 cloudformation/sso/aws-sso-instance.go
 create mode 100644 cloudformation/stepfunctions/aws-stepfunctions-activity_encryptionconfiguration.go
 create mode 100644 cloudformation/stepfunctions/aws-stepfunctions-statemachine_encryptionconfiguration.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectaccesstokenconfiguration.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectconfiguration.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectgroupconfiguration.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectidentitytokenconfiguration.go
 create mode 100644 cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnecttokenselection.go
 create mode 100644 cloudformation/workspaces/aws-workspaces-workspacespool.go
 create mode 100644 cloudformation/workspaces/aws-workspaces-workspacespool_applicationsettings.go
 create mode 100644 cloudformation/workspaces/aws-workspaces-workspacespool_capacity.go
 create mode 100644 cloudformation/workspaces/aws-workspaces-workspacespool_timeoutsettings.go

diff --git a/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go b/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
index ce70abc0d9..aefac0a8a9 100644
--- a/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
+++ b/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
@@ -21,9 +21,9 @@ type CertificateAuthority_CrlConfiguration struct {
 	CustomCname *string `json:"CustomCname,omitempty"`
 
 	// Enabled AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html#cfn-acmpca-certificateauthority-crlconfiguration-enabled
-	Enabled *bool `json:"Enabled,omitempty"`
+	Enabled bool `json:"Enabled"`
 
 	// ExpirationInDays AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go b/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
index f9c190e760..071f16c3d6 100644
--- a/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
+++ b/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
@@ -11,9 +11,9 @@ import (
 type CertificateAuthority_EdiPartyName struct {
 
 	// NameAssigner AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-edipartyname.html#cfn-acmpca-certificateauthority-edipartyname-nameassigner
-	NameAssigner string `json:"NameAssigner"`
+	NameAssigner *string `json:"NameAssigner,omitempty"`
 
 	// PartyName AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go b/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
index d9b46b19e5..277f2972d6 100644
--- a/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
+++ b/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
@@ -11,9 +11,9 @@ import (
 type CertificateAuthority_OcspConfiguration struct {
 
 	// Enabled AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-ocspconfiguration.html#cfn-acmpca-certificateauthority-ocspconfiguration-enabled
-	Enabled *bool `json:"Enabled,omitempty"`
+	Enabled bool `json:"Enabled"`
 
 	// OcspCustomCname AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/all.go b/cloudformation/all.go
index 06a5be61a2..6b5092e8cf 100644
--- a/cloudformation/all.go
+++ b/cloudformation/all.go
@@ -16,10 +16,12 @@ import (
 	"github.com/awslabs/goformation/v7/cloudformation/appintegrations"
 	"github.com/awslabs/goformation/v7/cloudformation/applicationautoscaling"
 	"github.com/awslabs/goformation/v7/cloudformation/applicationinsights"
+	"github.com/awslabs/goformation/v7/cloudformation/applicationsignals"
 	"github.com/awslabs/goformation/v7/cloudformation/appmesh"
 	"github.com/awslabs/goformation/v7/cloudformation/apprunner"
 	"github.com/awslabs/goformation/v7/cloudformation/appstream"
 	"github.com/awslabs/goformation/v7/cloudformation/appsync"
+	"github.com/awslabs/goformation/v7/cloudformation/apptest"
 	"github.com/awslabs/goformation/v7/cloudformation/aps"
 	"github.com/awslabs/goformation/v7/cloudformation/arczonalshift"
 	"github.com/awslabs/goformation/v7/cloudformation/ask"
@@ -143,6 +145,7 @@ import (
 	"github.com/awslabs/goformation/v7/cloudformation/kms"
 	"github.com/awslabs/goformation/v7/cloudformation/lakeformation"
 	"github.com/awslabs/goformation/v7/cloudformation/lambda"
+	"github.com/awslabs/goformation/v7/cloudformation/launchwizard"
 	"github.com/awslabs/goformation/v7/cloudformation/lex"
 	"github.com/awslabs/goformation/v7/cloudformation/licensemanager"
 	"github.com/awslabs/goformation/v7/cloudformation/lightsail"
@@ -180,11 +183,13 @@ import (
 	"github.com/awslabs/goformation/v7/cloudformation/panorama"
 	"github.com/awslabs/goformation/v7/cloudformation/paymentcryptography"
 	"github.com/awslabs/goformation/v7/cloudformation/pcaconnectorad"
+	"github.com/awslabs/goformation/v7/cloudformation/pcaconnectorscep"
 	"github.com/awslabs/goformation/v7/cloudformation/personalize"
 	"github.com/awslabs/goformation/v7/cloudformation/pinpoint"
 	"github.com/awslabs/goformation/v7/cloudformation/pinpointemail"
 	"github.com/awslabs/goformation/v7/cloudformation/pipes"
 	"github.com/awslabs/goformation/v7/cloudformation/proton"
+	"github.com/awslabs/goformation/v7/cloudformation/qbusiness"
 	"github.com/awslabs/goformation/v7/cloudformation/qldb"
 	"github.com/awslabs/goformation/v7/cloudformation/quicksight"
 	"github.com/awslabs/goformation/v7/cloudformation/ram"
@@ -227,6 +232,7 @@ import (
 	"github.com/awslabs/goformation/v7/cloudformation/ssm"
 	"github.com/awslabs/goformation/v7/cloudformation/ssmcontacts"
 	"github.com/awslabs/goformation/v7/cloudformation/ssmincidents"
+	"github.com/awslabs/goformation/v7/cloudformation/ssmquicksetup"
 	"github.com/awslabs/goformation/v7/cloudformation/sso"
 	"github.com/awslabs/goformation/v7/cloudformation/stepfunctions"
 	"github.com/awslabs/goformation/v7/cloudformation/supportapp"
@@ -259,6 +265,7 @@ func AllResources() map[string]Resource {
 		"AWS::APS::RuleGroupsNamespace":                                    &aps.RuleGroupsNamespace{},
 		"AWS::APS::Scraper":                                                &aps.Scraper{},
 		"AWS::APS::Workspace":                                              &aps.Workspace{},
+		"AWS::ARCZonalShift::AutoshiftObserverNotificationStatus":          &arczonalshift.AutoshiftObserverNotificationStatus{},
 		"AWS::ARCZonalShift::ZonalAutoshiftConfiguration":                  &arczonalshift.ZonalAutoshiftConfiguration{},
 		"AWS::AccessAnalyzer::Analyzer":                                    &accessanalyzer.Analyzer{},
 		"AWS::AmazonMQ::Broker":                                            &amazonmq.Broker{},
@@ -351,9 +358,11 @@ func AllResources() map[string]Resource {
 		"AWS::AppSync::GraphQLSchema":                                      &appsync.GraphQLSchema{},
 		"AWS::AppSync::Resolver":                                           &appsync.Resolver{},
 		"AWS::AppSync::SourceApiAssociation":                               &appsync.SourceApiAssociation{},
+		"AWS::AppTest::TestCase":                                           &apptest.TestCase{},
 		"AWS::ApplicationAutoScaling::ScalableTarget":                      &applicationautoscaling.ScalableTarget{},
 		"AWS::ApplicationAutoScaling::ScalingPolicy":                       &applicationautoscaling.ScalingPolicy{},
 		"AWS::ApplicationInsights::Application":                            &applicationinsights.Application{},
+		"AWS::ApplicationSignals::ServiceLevelObjective":                   &applicationsignals.ServiceLevelObjective{},
 		"AWS::Athena::CapacityReservation":                                 &athena.CapacityReservation{},
 		"AWS::Athena::DataCatalog":                                         &athena.DataCatalog{},
 		"AWS::Athena::NamedQuery":                                          &athena.NamedQuery{},
@@ -387,8 +396,14 @@ func AllResources() map[string]Resource {
 		"AWS::Bedrock::Agent":                                              &bedrock.Agent{},
 		"AWS::Bedrock::AgentAlias":                                         &bedrock.AgentAlias{},
 		"AWS::Bedrock::DataSource":                                         &bedrock.DataSource{},
+		"AWS::Bedrock::Flow":                                               &bedrock.Flow{},
+		"AWS::Bedrock::FlowAlias":                                          &bedrock.FlowAlias{},
+		"AWS::Bedrock::FlowVersion":                                        &bedrock.FlowVersion{},
 		"AWS::Bedrock::Guardrail":                                          &bedrock.Guardrail{},
+		"AWS::Bedrock::GuardrailVersion":                                   &bedrock.GuardrailVersion{},
 		"AWS::Bedrock::KnowledgeBase":                                      &bedrock.KnowledgeBase{},
+		"AWS::Bedrock::Prompt":                                             &bedrock.Prompt{},
+		"AWS::Bedrock::PromptVersion":                                      &bedrock.PromptVersion{},
 		"AWS::BillingConductor::BillingGroup":                              &billingconductor.BillingGroup{},
 		"AWS::BillingConductor::CustomLineItem":                            &billingconductor.CustomLineItem{},
 		"AWS::BillingConductor::PricingPlan":                               &billingconductor.PricingPlan{},
@@ -410,6 +425,8 @@ func AllResources() map[string]Resource {
 		"AWS::CleanRooms::Collaboration":                                   &cleanrooms.Collaboration{},
 		"AWS::CleanRooms::ConfiguredTable":                                 &cleanrooms.ConfiguredTable{},
 		"AWS::CleanRooms::ConfiguredTableAssociation":                      &cleanrooms.ConfiguredTableAssociation{},
+		"AWS::CleanRooms::IdMappingTable":                                  &cleanrooms.IdMappingTable{},
+		"AWS::CleanRooms::IdNamespaceAssociation":                          &cleanrooms.IdNamespaceAssociation{},
 		"AWS::CleanRooms::Membership":                                      &cleanrooms.Membership{},
 		"AWS::CleanRooms::PrivacyBudgetTemplate":                           &cleanrooms.PrivacyBudgetTemplate{},
 		"AWS::CleanRoomsML::TrainingDataset":                               &cleanroomsml.TrainingDataset{},
@@ -502,6 +519,7 @@ func AllResources() map[string]Resource {
 		"AWS::Config::OrganizationConformancePack":                         &config.OrganizationConformancePack{},
 		"AWS::Config::RemediationConfiguration":                            &config.RemediationConfiguration{},
 		"AWS::Config::StoredQuery":                                         &config.StoredQuery{},
+		"AWS::Connect::AgentStatus":                                        &connect.AgentStatus{},
 		"AWS::Connect::ApprovedOrigin":                                     &connect.ApprovedOrigin{},
 		"AWS::Connect::ContactFlow":                                        &connect.ContactFlow{},
 		"AWS::Connect::ContactFlowModule":                                  &connect.ContactFlowModule{},
@@ -523,6 +541,7 @@ func AllResources() map[string]Resource {
 		"AWS::Connect::TrafficDistributionGroup":                           &connect.TrafficDistributionGroup{},
 		"AWS::Connect::User":                                               &connect.User{},
 		"AWS::Connect::UserHierarchyGroup":                                 &connect.UserHierarchyGroup{},
+		"AWS::Connect::UserHierarchyStructure":                             &connect.UserHierarchyStructure{},
 		"AWS::Connect::View":                                               &connect.View{},
 		"AWS::Connect::ViewVersion":                                        &connect.ViewVersion{},
 		"AWS::ConnectCampaigns::Campaign":                                  &connectcampaigns.Campaign{},
@@ -572,14 +591,19 @@ func AllResources() map[string]Resource {
 		"AWS::DataZone::DataSource":                                        &datazone.DataSource{},
 		"AWS::DataZone::Domain":                                            &datazone.Domain{},
 		"AWS::DataZone::Environment":                                       &datazone.Environment{},
+		"AWS::DataZone::EnvironmentActions":                                &datazone.EnvironmentActions{},
 		"AWS::DataZone::EnvironmentBlueprintConfiguration":                 &datazone.EnvironmentBlueprintConfiguration{},
 		"AWS::DataZone::EnvironmentProfile":                                &datazone.EnvironmentProfile{},
+		"AWS::DataZone::GroupProfile":                                      &datazone.GroupProfile{},
 		"AWS::DataZone::Project":                                           &datazone.Project{},
+		"AWS::DataZone::ProjectMembership":                                 &datazone.ProjectMembership{},
 		"AWS::DataZone::SubscriptionTarget":                                &datazone.SubscriptionTarget{},
+		"AWS::DataZone::UserProfile":                                       &datazone.UserProfile{},
 		"AWS::Deadline::Farm":                                              &deadline.Farm{},
 		"AWS::Deadline::Fleet":                                             &deadline.Fleet{},
 		"AWS::Deadline::LicenseEndpoint":                                   &deadline.LicenseEndpoint{},
 		"AWS::Deadline::MeteredProduct":                                    &deadline.MeteredProduct{},
+		"AWS::Deadline::Monitor":                                           &deadline.Monitor{},
 		"AWS::Deadline::Queue":                                             &deadline.Queue{},
 		"AWS::Deadline::QueueEnvironment":                                  &deadline.QueueEnvironment{},
 		"AWS::Deadline::QueueFleetAssociation":                             &deadline.QueueFleetAssociation{},
@@ -823,6 +847,7 @@ func AllResources() map[string]Resource {
 		"AWS::Glue::Table":                                                 &glue.Table{},
 		"AWS::Glue::TableOptimizer":                                        &glue.TableOptimizer{},
 		"AWS::Glue::Trigger":                                               &glue.Trigger{},
+		"AWS::Glue::UsageProfile":                                          &glue.UsageProfile{},
 		"AWS::Glue::Workflow":                                              &glue.Workflow{},
 		"AWS::Grafana::Workspace":                                          &grafana.Workspace{},
 		"AWS::Greengrass::ConnectorDefinition":                             &greengrass.ConnectorDefinition{},
@@ -849,6 +874,7 @@ func AllResources() map[string]Resource {
 		"AWS::GuardDuty::Detector":                                         &guardduty.Detector{},
 		"AWS::GuardDuty::Filter":                                           &guardduty.Filter{},
 		"AWS::GuardDuty::IPSet":                                            &guardduty.IPSet{},
+		"AWS::GuardDuty::MalwareProtectionPlan":                            &guardduty.MalwareProtectionPlan{},
 		"AWS::GuardDuty::Master":                                           &guardduty.Master{},
 		"AWS::GuardDuty::Member":                                           &guardduty.Member{},
 		"AWS::GuardDuty::ThreatIntelSet":                                   &guardduty.ThreatIntelSet{},
@@ -874,6 +900,7 @@ func AllResources() map[string]Resource {
 		"AWS::IVS::EncoderConfiguration":                                   &ivs.EncoderConfiguration{},
 		"AWS::IVS::PlaybackKeyPair":                                        &ivs.PlaybackKeyPair{},
 		"AWS::IVS::PlaybackRestrictionPolicy":                              &ivs.PlaybackRestrictionPolicy{},
+		"AWS::IVS::PublicKey":                                              &ivs.PublicKey{},
 		"AWS::IVS::RecordingConfiguration":                                 &ivs.RecordingConfiguration{},
 		"AWS::IVS::Stage":                                                  &ivs.Stage{},
 		"AWS::IVS::StorageConfiguration":                                   &ivs.StorageConfiguration{},
@@ -977,6 +1004,7 @@ func AllResources() map[string]Resource {
 		"AWS::Kendra::Faq":                                                 &kendra.Faq{},
 		"AWS::Kendra::Index":                                               &kendra.Index{},
 		"AWS::KendraRanking::ExecutionPlan":                                &kendraranking.ExecutionPlan{},
+		"AWS::Kinesis::ResourcePolicy":                                     &kinesis.ResourcePolicy{},
 		"AWS::Kinesis::Stream":                                             &kinesis.Stream{},
 		"AWS::Kinesis::StreamConsumer":                                     &kinesis.StreamConsumer{},
 		"AWS::KinesisAnalytics::Application":                               &kinesisanalytics.Application{},
@@ -1006,6 +1034,7 @@ func AllResources() map[string]Resource {
 		"AWS::Lambda::Permission":                                          &lambda.Permission{},
 		"AWS::Lambda::Url":                                                 &lambda.Url{},
 		"AWS::Lambda::Version":                                             &lambda.Version{},
+		"AWS::LaunchWizard::Deployment":                                    &launchwizard.Deployment{},
 		"AWS::Lex::Bot":                                                    &lex.Bot{},
 		"AWS::Lex::BotAlias":                                               &lex.BotAlias{},
 		"AWS::Lex::BotVersion":                                             &lex.BotVersion{},
@@ -1076,10 +1105,19 @@ func AllResources() map[string]Resource {
 		"AWS::MediaConvert::Preset":                                        &mediaconvert.Preset{},
 		"AWS::MediaConvert::Queue":                                         &mediaconvert.Queue{},
 		"AWS::MediaLive::Channel":                                          &medialive.Channel{},
+		"AWS::MediaLive::ChannelPlacementGroup":                            &medialive.ChannelPlacementGroup{},
+		"AWS::MediaLive::CloudWatchAlarmTemplate":                          &medialive.CloudWatchAlarmTemplate{},
+		"AWS::MediaLive::CloudWatchAlarmTemplateGroup":                     &medialive.CloudWatchAlarmTemplateGroup{},
+		"AWS::MediaLive::Cluster":                                          &medialive.Cluster{},
+		"AWS::MediaLive::EventBridgeRuleTemplate":                          &medialive.EventBridgeRuleTemplate{},
+		"AWS::MediaLive::EventBridgeRuleTemplateGroup":                     &medialive.EventBridgeRuleTemplateGroup{},
 		"AWS::MediaLive::Input":                                            &medialive.Input{},
 		"AWS::MediaLive::InputSecurityGroup":                               &medialive.InputSecurityGroup{},
 		"AWS::MediaLive::Multiplex":                                        &medialive.Multiplex{},
 		"AWS::MediaLive::Multiplexprogram":                                 &medialive.Multiplexprogram{},
+		"AWS::MediaLive::Network":                                          &medialive.Network{},
+		"AWS::MediaLive::SdiSource":                                        &medialive.SdiSource{},
+		"AWS::MediaLive::SignalMap":                                        &medialive.SignalMap{},
 		"AWS::MediaPackage::Asset":                                         &mediapackage.Asset{},
 		"AWS::MediaPackage::Channel":                                       &mediapackage.Channel{},
 		"AWS::MediaPackage::OriginEndpoint":                                &mediapackage.OriginEndpoint{},
@@ -1107,6 +1145,7 @@ func AllResources() map[string]Resource {
 		"AWS::Neptune::DBInstance":                                         &neptune.DBInstance{},
 		"AWS::Neptune::DBParameterGroup":                                   &neptune.DBParameterGroup{},
 		"AWS::Neptune::DBSubnetGroup":                                      &neptune.DBSubnetGroup{},
+		"AWS::Neptune::EventSubscription":                                  &neptune.EventSubscription{},
 		"AWS::NeptuneGraph::Graph":                                         &neptunegraph.Graph{},
 		"AWS::NeptuneGraph::PrivateGraphEndpoint":                          &neptunegraph.PrivateGraphEndpoint{},
 		"AWS::NetworkFirewall::Firewall":                                   &networkfirewall.Firewall{},
@@ -1166,6 +1205,8 @@ func AllResources() map[string]Resource {
 		"AWS::PCAConnectorAD::ServicePrincipalName":                        &pcaconnectorad.ServicePrincipalName{},
 		"AWS::PCAConnectorAD::Template":                                    &pcaconnectorad.Template{},
 		"AWS::PCAConnectorAD::TemplateGroupAccessControlEntry":             &pcaconnectorad.TemplateGroupAccessControlEntry{},
+		"AWS::PCAConnectorSCEP::Challenge":                                 &pcaconnectorscep.Challenge{},
+		"AWS::PCAConnectorSCEP::Connector":                                 &pcaconnectorscep.Connector{},
 		"AWS::Panorama::ApplicationInstance":                               &panorama.ApplicationInstance{},
 		"AWS::Panorama::Package":                                           &panorama.Package{},
 		"AWS::Panorama::PackageVersion":                                    &panorama.PackageVersion{},
@@ -1202,12 +1243,19 @@ func AllResources() map[string]Resource {
 		"AWS::Proton::EnvironmentAccountConnection":                        &proton.EnvironmentAccountConnection{},
 		"AWS::Proton::EnvironmentTemplate":                                 &proton.EnvironmentTemplate{},
 		"AWS::Proton::ServiceTemplate":                                     &proton.ServiceTemplate{},
+		"AWS::QBusiness::Application":                                      &qbusiness.Application{},
+		"AWS::QBusiness::DataSource":                                       &qbusiness.DataSource{},
+		"AWS::QBusiness::Index":                                            &qbusiness.Index{},
+		"AWS::QBusiness::Plugin":                                           &qbusiness.Plugin{},
+		"AWS::QBusiness::Retriever":                                        &qbusiness.Retriever{},
+		"AWS::QBusiness::WebExperience":                                    &qbusiness.WebExperience{},
 		"AWS::QLDB::Ledger":                                                &qldb.Ledger{},
 		"AWS::QLDB::Stream":                                                &qldb.Stream{},
 		"AWS::QuickSight::Analysis":                                        &quicksight.Analysis{},
 		"AWS::QuickSight::Dashboard":                                       &quicksight.Dashboard{},
 		"AWS::QuickSight::DataSet":                                         &quicksight.DataSet{},
 		"AWS::QuickSight::DataSource":                                      &quicksight.DataSource{},
+		"AWS::QuickSight::Folder":                                          &quicksight.Folder{},
 		"AWS::QuickSight::RefreshSchedule":                                 &quicksight.RefreshSchedule{},
 		"AWS::QuickSight::Template":                                        &quicksight.Template{},
 		"AWS::QuickSight::Theme":                                           &quicksight.Theme{},
@@ -1317,6 +1365,13 @@ func AllResources() map[string]Resource {
 		"AWS::SES::ContactList":                                            &ses.ContactList{},
 		"AWS::SES::DedicatedIpPool":                                        &ses.DedicatedIpPool{},
 		"AWS::SES::EmailIdentity":                                          &ses.EmailIdentity{},
+		"AWS::SES::MailManagerAddonInstance":                               &ses.MailManagerAddonInstance{},
+		"AWS::SES::MailManagerAddonSubscription":                           &ses.MailManagerAddonSubscription{},
+		"AWS::SES::MailManagerArchive":                                     &ses.MailManagerArchive{},
+		"AWS::SES::MailManagerIngressPoint":                                &ses.MailManagerIngressPoint{},
+		"AWS::SES::MailManagerRelay":                                       &ses.MailManagerRelay{},
+		"AWS::SES::MailManagerRuleSet":                                     &ses.MailManagerRuleSet{},
+		"AWS::SES::MailManagerTrafficPolicy":                               &ses.MailManagerTrafficPolicy{},
 		"AWS::SES::ReceiptFilter":                                          &ses.ReceiptFilter{},
 		"AWS::SES::ReceiptRule":                                            &ses.ReceiptRule{},
 		"AWS::SES::ReceiptRuleSet":                                         &ses.ReceiptRuleSet{},
@@ -1344,11 +1399,16 @@ func AllResources() map[string]Resource {
 		"AWS::SSMContacts::Rotation":                                       &ssmcontacts.Rotation{},
 		"AWS::SSMIncidents::ReplicationSet":                                &ssmincidents.ReplicationSet{},
 		"AWS::SSMIncidents::ResponsePlan":                                  &ssmincidents.ResponsePlan{},
+		"AWS::SSMQuickSetup::ConfigurationManager":                         &ssmquicksetup.ConfigurationManager{},
+		"AWS::SSO::Application":                                            &sso.Application{},
+		"AWS::SSO::ApplicationAssignment":                                  &sso.ApplicationAssignment{},
 		"AWS::SSO::Assignment":                                             &sso.Assignment{},
+		"AWS::SSO::Instance":                                               &sso.Instance{},
 		"AWS::SSO::InstanceAccessControlAttributeConfiguration":            &sso.InstanceAccessControlAttributeConfiguration{},
 		"AWS::SSO::PermissionSet":                                          &sso.PermissionSet{},
 		"AWS::SageMaker::App":                                              &sagemaker.App{},
 		"AWS::SageMaker::AppImageConfig":                                   &sagemaker.AppImageConfig{},
+		"AWS::SageMaker::Cluster":                                          &sagemaker.Cluster{},
 		"AWS::SageMaker::CodeRepository":                                   &sagemaker.CodeRepository{},
 		"AWS::SageMaker::DataQualityJobDefinition":                         &sagemaker.DataQualityJobDefinition{},
 		"AWS::SageMaker::Device":                                           &sagemaker.Device{},
@@ -1361,6 +1421,7 @@ func AllResources() map[string]Resource {
 		"AWS::SageMaker::ImageVersion":                                     &sagemaker.ImageVersion{},
 		"AWS::SageMaker::InferenceComponent":                               &sagemaker.InferenceComponent{},
 		"AWS::SageMaker::InferenceExperiment":                              &sagemaker.InferenceExperiment{},
+		"AWS::SageMaker::MlflowTrackingServer":                             &sagemaker.MlflowTrackingServer{},
 		"AWS::SageMaker::Model":                                            &sagemaker.Model{},
 		"AWS::SageMaker::ModelBiasJobDefinition":                           &sagemaker.ModelBiasJobDefinition{},
 		"AWS::SageMaker::ModelCard":                                        &sagemaker.ModelCard{},
@@ -1374,6 +1435,7 @@ func AllResources() map[string]Resource {
 		"AWS::SageMaker::Pipeline":                                         &sagemaker.Pipeline{},
 		"AWS::SageMaker::Project":                                          &sagemaker.Project{},
 		"AWS::SageMaker::Space":                                            &sagemaker.Space{},
+		"AWS::SageMaker::StudioLifecycleConfig":                            &sagemaker.StudioLifecycleConfig{},
 		"AWS::SageMaker::UserProfile":                                      &sagemaker.UserProfile{},
 		"AWS::SageMaker::Workteam":                                         &sagemaker.Workteam{},
 		"AWS::Scheduler::Schedule":                                         &scheduler.Schedule{},
@@ -1383,14 +1445,20 @@ func AllResources() map[string]Resource {
 		"AWS::SecretsManager::Secret":                                      &secretsmanager.Secret{},
 		"AWS::SecretsManager::SecretTargetAttachment":                      &secretsmanager.SecretTargetAttachment{},
 		"AWS::SecurityHub::AutomationRule":                                 &securityhub.AutomationRule{},
+		"AWS::SecurityHub::ConfigurationPolicy":                            &securityhub.ConfigurationPolicy{},
 		"AWS::SecurityHub::DelegatedAdmin":                                 &securityhub.DelegatedAdmin{},
+		"AWS::SecurityHub::FindingAggregator":                              &securityhub.FindingAggregator{},
 		"AWS::SecurityHub::Hub":                                            &securityhub.Hub{},
 		"AWS::SecurityHub::Insight":                                        &securityhub.Insight{},
+		"AWS::SecurityHub::OrganizationConfiguration":                      &securityhub.OrganizationConfiguration{},
+		"AWS::SecurityHub::PolicyAssociation":                              &securityhub.PolicyAssociation{},
 		"AWS::SecurityHub::ProductSubscription":                            &securityhub.ProductSubscription{},
+		"AWS::SecurityHub::SecurityControl":                                &securityhub.SecurityControl{},
 		"AWS::SecurityHub::Standard":                                       &securityhub.Standard{},
 		"AWS::SecurityLake::AwsLogSource":                                  &securitylake.AwsLogSource{},
 		"AWS::SecurityLake::DataLake":                                      &securitylake.DataLake{},
 		"AWS::SecurityLake::Subscriber":                                    &securitylake.Subscriber{},
+		"AWS::SecurityLake::SubscriberNotification":                        &securitylake.SubscriberNotification{},
 		"AWS::Serverless::Api":                                             &serverless.Api{},
 		"AWS::Serverless::Application":                                     &serverless.Application{},
 		"AWS::Serverless::Function":                                        &serverless.Function{},
@@ -1495,6 +1563,7 @@ func AllResources() map[string]Resource {
 		"AWS::Wisdom::KnowledgeBase":                                       &wisdom.KnowledgeBase{},
 		"AWS::WorkSpaces::ConnectionAlias":                                 &workspaces.ConnectionAlias{},
 		"AWS::WorkSpaces::Workspace":                                       &workspaces.Workspace{},
+		"AWS::WorkSpaces::WorkspacesPool":                                  &workspaces.WorkspacesPool{},
 		"AWS::WorkSpacesThinClient::Environment":                           &workspacesthinclient.Environment{},
 		"AWS::WorkSpacesWeb::BrowserSettings":                              &workspacesweb.BrowserSettings{},
 		"AWS::WorkSpacesWeb::IdentityProvider":                             &workspacesweb.IdentityProvider{},
@@ -1683,6 +1752,30 @@ func (t *Template) GetAPSWorkspaceWithName(name string) (*aps.Workspace, error)
 	return nil, fmt.Errorf("resource %q of type aps.Workspace not found", name)
 }
 
+// GetAllARCZonalShiftAutoshiftObserverNotificationStatusResources retrieves all arczonalshift.AutoshiftObserverNotificationStatus items from an AWS CloudFormation template
+func (t *Template) GetAllARCZonalShiftAutoshiftObserverNotificationStatusResources() map[string]*arczonalshift.AutoshiftObserverNotificationStatus {
+	results := map[string]*arczonalshift.AutoshiftObserverNotificationStatus{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *arczonalshift.AutoshiftObserverNotificationStatus:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetARCZonalShiftAutoshiftObserverNotificationStatusWithName retrieves all arczonalshift.AutoshiftObserverNotificationStatus items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetARCZonalShiftAutoshiftObserverNotificationStatusWithName(name string) (*arczonalshift.AutoshiftObserverNotificationStatus, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *arczonalshift.AutoshiftObserverNotificationStatus:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type arczonalshift.AutoshiftObserverNotificationStatus not found", name)
+}
+
 // GetAllARCZonalShiftZonalAutoshiftConfigurationResources retrieves all arczonalshift.ZonalAutoshiftConfiguration items from an AWS CloudFormation template
 func (t *Template) GetAllARCZonalShiftZonalAutoshiftConfigurationResources() map[string]*arczonalshift.ZonalAutoshiftConfiguration {
 	results := map[string]*arczonalshift.ZonalAutoshiftConfiguration{}
@@ -3891,6 +3984,30 @@ func (t *Template) GetAppSyncSourceApiAssociationWithName(name string) (*appsync
 	return nil, fmt.Errorf("resource %q of type appsync.SourceApiAssociation not found", name)
 }
 
+// GetAllAppTestTestCaseResources retrieves all apptest.TestCase items from an AWS CloudFormation template
+func (t *Template) GetAllAppTestTestCaseResources() map[string]*apptest.TestCase {
+	results := map[string]*apptest.TestCase{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apptest.TestCase:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppTestTestCaseWithName retrieves all apptest.TestCase items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppTestTestCaseWithName(name string) (*apptest.TestCase, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apptest.TestCase:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apptest.TestCase not found", name)
+}
+
 // GetAllApplicationAutoScalingScalableTargetResources retrieves all applicationautoscaling.ScalableTarget items from an AWS CloudFormation template
 func (t *Template) GetAllApplicationAutoScalingScalableTargetResources() map[string]*applicationautoscaling.ScalableTarget {
 	results := map[string]*applicationautoscaling.ScalableTarget{}
@@ -3963,6 +4080,30 @@ func (t *Template) GetApplicationInsightsApplicationWithName(name string) (*appl
 	return nil, fmt.Errorf("resource %q of type applicationinsights.Application not found", name)
 }
 
+// GetAllApplicationSignalsServiceLevelObjectiveResources retrieves all applicationsignals.ServiceLevelObjective items from an AWS CloudFormation template
+func (t *Template) GetAllApplicationSignalsServiceLevelObjectiveResources() map[string]*applicationsignals.ServiceLevelObjective {
+	results := map[string]*applicationsignals.ServiceLevelObjective{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *applicationsignals.ServiceLevelObjective:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApplicationSignalsServiceLevelObjectiveWithName retrieves all applicationsignals.ServiceLevelObjective items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApplicationSignalsServiceLevelObjectiveWithName(name string) (*applicationsignals.ServiceLevelObjective, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *applicationsignals.ServiceLevelObjective:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type applicationsignals.ServiceLevelObjective not found", name)
+}
+
 // GetAllAthenaCapacityReservationResources retrieves all athena.CapacityReservation items from an AWS CloudFormation template
 func (t *Template) GetAllAthenaCapacityReservationResources() map[string]*athena.CapacityReservation {
 	results := map[string]*athena.CapacityReservation{}
@@ -4755,6 +4896,78 @@ func (t *Template) GetBedrockDataSourceWithName(name string) (*bedrock.DataSourc
 	return nil, fmt.Errorf("resource %q of type bedrock.DataSource not found", name)
 }
 
+// GetAllBedrockFlowResources retrieves all bedrock.Flow items from an AWS CloudFormation template
+func (t *Template) GetAllBedrockFlowResources() map[string]*bedrock.Flow {
+	results := map[string]*bedrock.Flow{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *bedrock.Flow:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBedrockFlowWithName retrieves all bedrock.Flow items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBedrockFlowWithName(name string) (*bedrock.Flow, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *bedrock.Flow:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type bedrock.Flow not found", name)
+}
+
+// GetAllBedrockFlowAliasResources retrieves all bedrock.FlowAlias items from an AWS CloudFormation template
+func (t *Template) GetAllBedrockFlowAliasResources() map[string]*bedrock.FlowAlias {
+	results := map[string]*bedrock.FlowAlias{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *bedrock.FlowAlias:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBedrockFlowAliasWithName retrieves all bedrock.FlowAlias items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBedrockFlowAliasWithName(name string) (*bedrock.FlowAlias, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *bedrock.FlowAlias:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type bedrock.FlowAlias not found", name)
+}
+
+// GetAllBedrockFlowVersionResources retrieves all bedrock.FlowVersion items from an AWS CloudFormation template
+func (t *Template) GetAllBedrockFlowVersionResources() map[string]*bedrock.FlowVersion {
+	results := map[string]*bedrock.FlowVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *bedrock.FlowVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBedrockFlowVersionWithName retrieves all bedrock.FlowVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBedrockFlowVersionWithName(name string) (*bedrock.FlowVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *bedrock.FlowVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type bedrock.FlowVersion not found", name)
+}
+
 // GetAllBedrockGuardrailResources retrieves all bedrock.Guardrail items from an AWS CloudFormation template
 func (t *Template) GetAllBedrockGuardrailResources() map[string]*bedrock.Guardrail {
 	results := map[string]*bedrock.Guardrail{}
@@ -4779,6 +4992,30 @@ func (t *Template) GetBedrockGuardrailWithName(name string) (*bedrock.Guardrail,
 	return nil, fmt.Errorf("resource %q of type bedrock.Guardrail not found", name)
 }
 
+// GetAllBedrockGuardrailVersionResources retrieves all bedrock.GuardrailVersion items from an AWS CloudFormation template
+func (t *Template) GetAllBedrockGuardrailVersionResources() map[string]*bedrock.GuardrailVersion {
+	results := map[string]*bedrock.GuardrailVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *bedrock.GuardrailVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBedrockGuardrailVersionWithName retrieves all bedrock.GuardrailVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBedrockGuardrailVersionWithName(name string) (*bedrock.GuardrailVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *bedrock.GuardrailVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type bedrock.GuardrailVersion not found", name)
+}
+
 // GetAllBedrockKnowledgeBaseResources retrieves all bedrock.KnowledgeBase items from an AWS CloudFormation template
 func (t *Template) GetAllBedrockKnowledgeBaseResources() map[string]*bedrock.KnowledgeBase {
 	results := map[string]*bedrock.KnowledgeBase{}
@@ -4803,6 +5040,54 @@ func (t *Template) GetBedrockKnowledgeBaseWithName(name string) (*bedrock.Knowle
 	return nil, fmt.Errorf("resource %q of type bedrock.KnowledgeBase not found", name)
 }
 
+// GetAllBedrockPromptResources retrieves all bedrock.Prompt items from an AWS CloudFormation template
+func (t *Template) GetAllBedrockPromptResources() map[string]*bedrock.Prompt {
+	results := map[string]*bedrock.Prompt{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *bedrock.Prompt:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBedrockPromptWithName retrieves all bedrock.Prompt items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBedrockPromptWithName(name string) (*bedrock.Prompt, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *bedrock.Prompt:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type bedrock.Prompt not found", name)
+}
+
+// GetAllBedrockPromptVersionResources retrieves all bedrock.PromptVersion items from an AWS CloudFormation template
+func (t *Template) GetAllBedrockPromptVersionResources() map[string]*bedrock.PromptVersion {
+	results := map[string]*bedrock.PromptVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *bedrock.PromptVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBedrockPromptVersionWithName retrieves all bedrock.PromptVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBedrockPromptVersionWithName(name string) (*bedrock.PromptVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *bedrock.PromptVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type bedrock.PromptVersion not found", name)
+}
+
 // GetAllBillingConductorBillingGroupResources retrieves all billingconductor.BillingGroup items from an AWS CloudFormation template
 func (t *Template) GetAllBillingConductorBillingGroupResources() map[string]*billingconductor.BillingGroup {
 	results := map[string]*billingconductor.BillingGroup{}
@@ -5307,6 +5592,54 @@ func (t *Template) GetCleanRoomsConfiguredTableAssociationWithName(name string)
 	return nil, fmt.Errorf("resource %q of type cleanrooms.ConfiguredTableAssociation not found", name)
 }
 
+// GetAllCleanRoomsIdMappingTableResources retrieves all cleanrooms.IdMappingTable items from an AWS CloudFormation template
+func (t *Template) GetAllCleanRoomsIdMappingTableResources() map[string]*cleanrooms.IdMappingTable {
+	results := map[string]*cleanrooms.IdMappingTable{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cleanrooms.IdMappingTable:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCleanRoomsIdMappingTableWithName retrieves all cleanrooms.IdMappingTable items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCleanRoomsIdMappingTableWithName(name string) (*cleanrooms.IdMappingTable, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cleanrooms.IdMappingTable:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cleanrooms.IdMappingTable not found", name)
+}
+
+// GetAllCleanRoomsIdNamespaceAssociationResources retrieves all cleanrooms.IdNamespaceAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllCleanRoomsIdNamespaceAssociationResources() map[string]*cleanrooms.IdNamespaceAssociation {
+	results := map[string]*cleanrooms.IdNamespaceAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cleanrooms.IdNamespaceAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCleanRoomsIdNamespaceAssociationWithName retrieves all cleanrooms.IdNamespaceAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCleanRoomsIdNamespaceAssociationWithName(name string) (*cleanrooms.IdNamespaceAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cleanrooms.IdNamespaceAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cleanrooms.IdNamespaceAssociation not found", name)
+}
+
 // GetAllCleanRoomsMembershipResources retrieves all cleanrooms.Membership items from an AWS CloudFormation template
 func (t *Template) GetAllCleanRoomsMembershipResources() map[string]*cleanrooms.Membership {
 	results := map[string]*cleanrooms.Membership{}
@@ -7515,6 +7848,30 @@ func (t *Template) GetConfigStoredQueryWithName(name string) (*config.StoredQuer
 	return nil, fmt.Errorf("resource %q of type config.StoredQuery not found", name)
 }
 
+// GetAllConnectAgentStatusResources retrieves all connect.AgentStatus items from an AWS CloudFormation template
+func (t *Template) GetAllConnectAgentStatusResources() map[string]*connect.AgentStatus {
+	results := map[string]*connect.AgentStatus{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.AgentStatus:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectAgentStatusWithName retrieves all connect.AgentStatus items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectAgentStatusWithName(name string) (*connect.AgentStatus, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.AgentStatus:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.AgentStatus not found", name)
+}
+
 // GetAllConnectApprovedOriginResources retrieves all connect.ApprovedOrigin items from an AWS CloudFormation template
 func (t *Template) GetAllConnectApprovedOriginResources() map[string]*connect.ApprovedOrigin {
 	results := map[string]*connect.ApprovedOrigin{}
@@ -8019,6 +8376,30 @@ func (t *Template) GetConnectUserHierarchyGroupWithName(name string) (*connect.U
 	return nil, fmt.Errorf("resource %q of type connect.UserHierarchyGroup not found", name)
 }
 
+// GetAllConnectUserHierarchyStructureResources retrieves all connect.UserHierarchyStructure items from an AWS CloudFormation template
+func (t *Template) GetAllConnectUserHierarchyStructureResources() map[string]*connect.UserHierarchyStructure {
+	results := map[string]*connect.UserHierarchyStructure{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.UserHierarchyStructure:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectUserHierarchyStructureWithName retrieves all connect.UserHierarchyStructure items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectUserHierarchyStructureWithName(name string) (*connect.UserHierarchyStructure, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.UserHierarchyStructure:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.UserHierarchyStructure not found", name)
+}
+
 // GetAllConnectViewResources retrieves all connect.View items from an AWS CloudFormation template
 func (t *Template) GetAllConnectViewResources() map[string]*connect.View {
 	results := map[string]*connect.View{}
@@ -9195,6 +9576,30 @@ func (t *Template) GetDataZoneEnvironmentWithName(name string) (*datazone.Enviro
 	return nil, fmt.Errorf("resource %q of type datazone.Environment not found", name)
 }
 
+// GetAllDataZoneEnvironmentActionsResources retrieves all datazone.EnvironmentActions items from an AWS CloudFormation template
+func (t *Template) GetAllDataZoneEnvironmentActionsResources() map[string]*datazone.EnvironmentActions {
+	results := map[string]*datazone.EnvironmentActions{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datazone.EnvironmentActions:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataZoneEnvironmentActionsWithName retrieves all datazone.EnvironmentActions items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataZoneEnvironmentActionsWithName(name string) (*datazone.EnvironmentActions, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datazone.EnvironmentActions:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datazone.EnvironmentActions not found", name)
+}
+
 // GetAllDataZoneEnvironmentBlueprintConfigurationResources retrieves all datazone.EnvironmentBlueprintConfiguration items from an AWS CloudFormation template
 func (t *Template) GetAllDataZoneEnvironmentBlueprintConfigurationResources() map[string]*datazone.EnvironmentBlueprintConfiguration {
 	results := map[string]*datazone.EnvironmentBlueprintConfiguration{}
@@ -9243,76 +9648,148 @@ func (t *Template) GetDataZoneEnvironmentProfileWithName(name string) (*datazone
 	return nil, fmt.Errorf("resource %q of type datazone.EnvironmentProfile not found", name)
 }
 
-// GetAllDataZoneProjectResources retrieves all datazone.Project items from an AWS CloudFormation template
-func (t *Template) GetAllDataZoneProjectResources() map[string]*datazone.Project {
-	results := map[string]*datazone.Project{}
+// GetAllDataZoneGroupProfileResources retrieves all datazone.GroupProfile items from an AWS CloudFormation template
+func (t *Template) GetAllDataZoneGroupProfileResources() map[string]*datazone.GroupProfile {
+	results := map[string]*datazone.GroupProfile{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *datazone.Project:
+		case *datazone.GroupProfile:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetDataZoneProjectWithName retrieves all datazone.Project items from an AWS CloudFormation template
+// GetDataZoneGroupProfileWithName retrieves all datazone.GroupProfile items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetDataZoneProjectWithName(name string) (*datazone.Project, error) {
+func (t *Template) GetDataZoneGroupProfileWithName(name string) (*datazone.GroupProfile, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *datazone.Project:
+		case *datazone.GroupProfile:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type datazone.Project not found", name)
+	return nil, fmt.Errorf("resource %q of type datazone.GroupProfile not found", name)
 }
 
-// GetAllDataZoneSubscriptionTargetResources retrieves all datazone.SubscriptionTarget items from an AWS CloudFormation template
-func (t *Template) GetAllDataZoneSubscriptionTargetResources() map[string]*datazone.SubscriptionTarget {
-	results := map[string]*datazone.SubscriptionTarget{}
+// GetAllDataZoneProjectResources retrieves all datazone.Project items from an AWS CloudFormation template
+func (t *Template) GetAllDataZoneProjectResources() map[string]*datazone.Project {
+	results := map[string]*datazone.Project{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *datazone.SubscriptionTarget:
+		case *datazone.Project:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetDataZoneSubscriptionTargetWithName retrieves all datazone.SubscriptionTarget items from an AWS CloudFormation template
+// GetDataZoneProjectWithName retrieves all datazone.Project items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetDataZoneSubscriptionTargetWithName(name string) (*datazone.SubscriptionTarget, error) {
+func (t *Template) GetDataZoneProjectWithName(name string) (*datazone.Project, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *datazone.SubscriptionTarget:
+		case *datazone.Project:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type datazone.SubscriptionTarget not found", name)
+	return nil, fmt.Errorf("resource %q of type datazone.Project not found", name)
 }
 
-// GetAllDeadlineFarmResources retrieves all deadline.Farm items from an AWS CloudFormation template
-func (t *Template) GetAllDeadlineFarmResources() map[string]*deadline.Farm {
-	results := map[string]*deadline.Farm{}
+// GetAllDataZoneProjectMembershipResources retrieves all datazone.ProjectMembership items from an AWS CloudFormation template
+func (t *Template) GetAllDataZoneProjectMembershipResources() map[string]*datazone.ProjectMembership {
+	results := map[string]*datazone.ProjectMembership{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *deadline.Farm:
+		case *datazone.ProjectMembership:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetDeadlineFarmWithName retrieves all deadline.Farm items from an AWS CloudFormation template
+// GetDataZoneProjectMembershipWithName retrieves all datazone.ProjectMembership items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetDeadlineFarmWithName(name string) (*deadline.Farm, error) {
+func (t *Template) GetDataZoneProjectMembershipWithName(name string) (*datazone.ProjectMembership, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *deadline.Farm:
+		case *datazone.ProjectMembership:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type deadline.Farm not found", name)
+	return nil, fmt.Errorf("resource %q of type datazone.ProjectMembership not found", name)
+}
+
+// GetAllDataZoneSubscriptionTargetResources retrieves all datazone.SubscriptionTarget items from an AWS CloudFormation template
+func (t *Template) GetAllDataZoneSubscriptionTargetResources() map[string]*datazone.SubscriptionTarget {
+	results := map[string]*datazone.SubscriptionTarget{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datazone.SubscriptionTarget:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataZoneSubscriptionTargetWithName retrieves all datazone.SubscriptionTarget items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataZoneSubscriptionTargetWithName(name string) (*datazone.SubscriptionTarget, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datazone.SubscriptionTarget:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datazone.SubscriptionTarget not found", name)
+}
+
+// GetAllDataZoneUserProfileResources retrieves all datazone.UserProfile items from an AWS CloudFormation template
+func (t *Template) GetAllDataZoneUserProfileResources() map[string]*datazone.UserProfile {
+	results := map[string]*datazone.UserProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datazone.UserProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataZoneUserProfileWithName retrieves all datazone.UserProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataZoneUserProfileWithName(name string) (*datazone.UserProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datazone.UserProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datazone.UserProfile not found", name)
+}
+
+// GetAllDeadlineFarmResources retrieves all deadline.Farm items from an AWS CloudFormation template
+func (t *Template) GetAllDeadlineFarmResources() map[string]*deadline.Farm {
+	results := map[string]*deadline.Farm{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *deadline.Farm:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDeadlineFarmWithName retrieves all deadline.Farm items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDeadlineFarmWithName(name string) (*deadline.Farm, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *deadline.Farm:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type deadline.Farm not found", name)
 }
 
 // GetAllDeadlineFleetResources retrieves all deadline.Fleet items from an AWS CloudFormation template
@@ -9387,6 +9864,30 @@ func (t *Template) GetDeadlineMeteredProductWithName(name string) (*deadline.Met
 	return nil, fmt.Errorf("resource %q of type deadline.MeteredProduct not found", name)
 }
 
+// GetAllDeadlineMonitorResources retrieves all deadline.Monitor items from an AWS CloudFormation template
+func (t *Template) GetAllDeadlineMonitorResources() map[string]*deadline.Monitor {
+	results := map[string]*deadline.Monitor{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *deadline.Monitor:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDeadlineMonitorWithName retrieves all deadline.Monitor items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDeadlineMonitorWithName(name string) (*deadline.Monitor, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *deadline.Monitor:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type deadline.Monitor not found", name)
+}
+
 // GetAllDeadlineQueueResources retrieves all deadline.Queue items from an AWS CloudFormation template
 func (t *Template) GetAllDeadlineQueueResources() map[string]*deadline.Queue {
 	results := map[string]*deadline.Queue{}
@@ -15219,6 +15720,30 @@ func (t *Template) GetGlueTriggerWithName(name string) (*glue.Trigger, error) {
 	return nil, fmt.Errorf("resource %q of type glue.Trigger not found", name)
 }
 
+// GetAllGlueUsageProfileResources retrieves all glue.UsageProfile items from an AWS CloudFormation template
+func (t *Template) GetAllGlueUsageProfileResources() map[string]*glue.UsageProfile {
+	results := map[string]*glue.UsageProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.UsageProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueUsageProfileWithName retrieves all glue.UsageProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueUsageProfileWithName(name string) (*glue.UsageProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.UsageProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.UsageProfile not found", name)
+}
+
 // GetAllGlueWorkflowResources retrieves all glue.Workflow items from an AWS CloudFormation template
 func (t *Template) GetAllGlueWorkflowResources() map[string]*glue.Workflow {
 	results := map[string]*glue.Workflow{}
@@ -15843,6 +16368,30 @@ func (t *Template) GetGuardDutyIPSetWithName(name string) (*guardduty.IPSet, err
 	return nil, fmt.Errorf("resource %q of type guardduty.IPSet not found", name)
 }
 
+// GetAllGuardDutyMalwareProtectionPlanResources retrieves all guardduty.MalwareProtectionPlan items from an AWS CloudFormation template
+func (t *Template) GetAllGuardDutyMalwareProtectionPlanResources() map[string]*guardduty.MalwareProtectionPlan {
+	results := map[string]*guardduty.MalwareProtectionPlan{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *guardduty.MalwareProtectionPlan:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGuardDutyMalwareProtectionPlanWithName retrieves all guardduty.MalwareProtectionPlan items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGuardDutyMalwareProtectionPlanWithName(name string) (*guardduty.MalwareProtectionPlan, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *guardduty.MalwareProtectionPlan:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type guardduty.MalwareProtectionPlan not found", name)
+}
+
 // GetAllGuardDutyMasterResources retrieves all guardduty.Master items from an AWS CloudFormation template
 func (t *Template) GetAllGuardDutyMasterResources() map[string]*guardduty.Master {
 	results := map[string]*guardduty.Master{}
@@ -16443,6 +16992,30 @@ func (t *Template) GetIVSPlaybackRestrictionPolicyWithName(name string) (*ivs.Pl
 	return nil, fmt.Errorf("resource %q of type ivs.PlaybackRestrictionPolicy not found", name)
 }
 
+// GetAllIVSPublicKeyResources retrieves all ivs.PublicKey items from an AWS CloudFormation template
+func (t *Template) GetAllIVSPublicKeyResources() map[string]*ivs.PublicKey {
+	results := map[string]*ivs.PublicKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ivs.PublicKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIVSPublicKeyWithName retrieves all ivs.PublicKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIVSPublicKeyWithName(name string) (*ivs.PublicKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ivs.PublicKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ivs.PublicKey not found", name)
+}
+
 // GetAllIVSRecordingConfigurationResources retrieves all ivs.RecordingConfiguration items from an AWS CloudFormation template
 func (t *Template) GetAllIVSRecordingConfigurationResources() map[string]*ivs.RecordingConfiguration {
 	results := map[string]*ivs.RecordingConfiguration{}
@@ -18915,6 +19488,30 @@ func (t *Template) GetKendraRankingExecutionPlanWithName(name string) (*kendrara
 	return nil, fmt.Errorf("resource %q of type kendraranking.ExecutionPlan not found", name)
 }
 
+// GetAllKinesisResourcePolicyResources retrieves all kinesis.ResourcePolicy items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisResourcePolicyResources() map[string]*kinesis.ResourcePolicy {
+	results := map[string]*kinesis.ResourcePolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesis.ResourcePolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisResourcePolicyWithName retrieves all kinesis.ResourcePolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisResourcePolicyWithName(name string) (*kinesis.ResourcePolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesis.ResourcePolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesis.ResourcePolicy not found", name)
+}
+
 // GetAllKinesisStreamResources retrieves all kinesis.Stream items from an AWS CloudFormation template
 func (t *Template) GetAllKinesisStreamResources() map[string]*kinesis.Stream {
 	results := map[string]*kinesis.Stream{}
@@ -19611,6 +20208,30 @@ func (t *Template) GetLambdaVersionWithName(name string) (*lambda.Version, error
 	return nil, fmt.Errorf("resource %q of type lambda.Version not found", name)
 }
 
+// GetAllLaunchWizardDeploymentResources retrieves all launchwizard.Deployment items from an AWS CloudFormation template
+func (t *Template) GetAllLaunchWizardDeploymentResources() map[string]*launchwizard.Deployment {
+	results := map[string]*launchwizard.Deployment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *launchwizard.Deployment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLaunchWizardDeploymentWithName retrieves all launchwizard.Deployment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLaunchWizardDeploymentWithName(name string) (*launchwizard.Deployment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *launchwizard.Deployment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type launchwizard.Deployment not found", name)
+}
+
 // GetAllLexBotResources retrieves all lex.Bot items from an AWS CloudFormation template
 func (t *Template) GetAllLexBotResources() map[string]*lex.Bot {
 	results := map[string]*lex.Bot{}
@@ -21291,220 +21912,436 @@ func (t *Template) GetMediaLiveChannelWithName(name string) (*medialive.Channel,
 	return nil, fmt.Errorf("resource %q of type medialive.Channel not found", name)
 }
 
-// GetAllMediaLiveInputResources retrieves all medialive.Input items from an AWS CloudFormation template
-func (t *Template) GetAllMediaLiveInputResources() map[string]*medialive.Input {
-	results := map[string]*medialive.Input{}
+// GetAllMediaLiveChannelPlacementGroupResources retrieves all medialive.ChannelPlacementGroup items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveChannelPlacementGroupResources() map[string]*medialive.ChannelPlacementGroup {
+	results := map[string]*medialive.ChannelPlacementGroup{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *medialive.Input:
+		case *medialive.ChannelPlacementGroup:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaLiveInputWithName retrieves all medialive.Input items from an AWS CloudFormation template
+// GetMediaLiveChannelPlacementGroupWithName retrieves all medialive.ChannelPlacementGroup items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaLiveInputWithName(name string) (*medialive.Input, error) {
+func (t *Template) GetMediaLiveChannelPlacementGroupWithName(name string) (*medialive.ChannelPlacementGroup, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *medialive.Input:
+		case *medialive.ChannelPlacementGroup:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type medialive.Input not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.ChannelPlacementGroup not found", name)
 }
 
-// GetAllMediaLiveInputSecurityGroupResources retrieves all medialive.InputSecurityGroup items from an AWS CloudFormation template
-func (t *Template) GetAllMediaLiveInputSecurityGroupResources() map[string]*medialive.InputSecurityGroup {
-	results := map[string]*medialive.InputSecurityGroup{}
+// GetAllMediaLiveCloudWatchAlarmTemplateResources retrieves all medialive.CloudWatchAlarmTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveCloudWatchAlarmTemplateResources() map[string]*medialive.CloudWatchAlarmTemplate {
+	results := map[string]*medialive.CloudWatchAlarmTemplate{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *medialive.InputSecurityGroup:
+		case *medialive.CloudWatchAlarmTemplate:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaLiveInputSecurityGroupWithName retrieves all medialive.InputSecurityGroup items from an AWS CloudFormation template
+// GetMediaLiveCloudWatchAlarmTemplateWithName retrieves all medialive.CloudWatchAlarmTemplate items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaLiveInputSecurityGroupWithName(name string) (*medialive.InputSecurityGroup, error) {
+func (t *Template) GetMediaLiveCloudWatchAlarmTemplateWithName(name string) (*medialive.CloudWatchAlarmTemplate, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *medialive.InputSecurityGroup:
+		case *medialive.CloudWatchAlarmTemplate:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type medialive.InputSecurityGroup not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.CloudWatchAlarmTemplate not found", name)
 }
 
-// GetAllMediaLiveMultiplexResources retrieves all medialive.Multiplex items from an AWS CloudFormation template
-func (t *Template) GetAllMediaLiveMultiplexResources() map[string]*medialive.Multiplex {
-	results := map[string]*medialive.Multiplex{}
+// GetAllMediaLiveCloudWatchAlarmTemplateGroupResources retrieves all medialive.CloudWatchAlarmTemplateGroup items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveCloudWatchAlarmTemplateGroupResources() map[string]*medialive.CloudWatchAlarmTemplateGroup {
+	results := map[string]*medialive.CloudWatchAlarmTemplateGroup{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *medialive.Multiplex:
+		case *medialive.CloudWatchAlarmTemplateGroup:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaLiveMultiplexWithName retrieves all medialive.Multiplex items from an AWS CloudFormation template
+// GetMediaLiveCloudWatchAlarmTemplateGroupWithName retrieves all medialive.CloudWatchAlarmTemplateGroup items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaLiveMultiplexWithName(name string) (*medialive.Multiplex, error) {
+func (t *Template) GetMediaLiveCloudWatchAlarmTemplateGroupWithName(name string) (*medialive.CloudWatchAlarmTemplateGroup, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *medialive.Multiplex:
+		case *medialive.CloudWatchAlarmTemplateGroup:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type medialive.Multiplex not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.CloudWatchAlarmTemplateGroup not found", name)
 }
 
-// GetAllMediaLiveMultiplexprogramResources retrieves all medialive.Multiplexprogram items from an AWS CloudFormation template
-func (t *Template) GetAllMediaLiveMultiplexprogramResources() map[string]*medialive.Multiplexprogram {
-	results := map[string]*medialive.Multiplexprogram{}
+// GetAllMediaLiveClusterResources retrieves all medialive.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveClusterResources() map[string]*medialive.Cluster {
+	results := map[string]*medialive.Cluster{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *medialive.Multiplexprogram:
+		case *medialive.Cluster:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaLiveMultiplexprogramWithName retrieves all medialive.Multiplexprogram items from an AWS CloudFormation template
+// GetMediaLiveClusterWithName retrieves all medialive.Cluster items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaLiveMultiplexprogramWithName(name string) (*medialive.Multiplexprogram, error) {
+func (t *Template) GetMediaLiveClusterWithName(name string) (*medialive.Cluster, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *medialive.Multiplexprogram:
+		case *medialive.Cluster:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type medialive.Multiplexprogram not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.Cluster not found", name)
 }
 
-// GetAllMediaPackageAssetResources retrieves all mediapackage.Asset items from an AWS CloudFormation template
-func (t *Template) GetAllMediaPackageAssetResources() map[string]*mediapackage.Asset {
-	results := map[string]*mediapackage.Asset{}
+// GetAllMediaLiveEventBridgeRuleTemplateResources retrieves all medialive.EventBridgeRuleTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveEventBridgeRuleTemplateResources() map[string]*medialive.EventBridgeRuleTemplate {
+	results := map[string]*medialive.EventBridgeRuleTemplate{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *mediapackage.Asset:
+		case *medialive.EventBridgeRuleTemplate:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaPackageAssetWithName retrieves all mediapackage.Asset items from an AWS CloudFormation template
+// GetMediaLiveEventBridgeRuleTemplateWithName retrieves all medialive.EventBridgeRuleTemplate items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaPackageAssetWithName(name string) (*mediapackage.Asset, error) {
+func (t *Template) GetMediaLiveEventBridgeRuleTemplateWithName(name string) (*medialive.EventBridgeRuleTemplate, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *mediapackage.Asset:
+		case *medialive.EventBridgeRuleTemplate:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type mediapackage.Asset not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.EventBridgeRuleTemplate not found", name)
 }
 
-// GetAllMediaPackageChannelResources retrieves all mediapackage.Channel items from an AWS CloudFormation template
-func (t *Template) GetAllMediaPackageChannelResources() map[string]*mediapackage.Channel {
-	results := map[string]*mediapackage.Channel{}
+// GetAllMediaLiveEventBridgeRuleTemplateGroupResources retrieves all medialive.EventBridgeRuleTemplateGroup items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveEventBridgeRuleTemplateGroupResources() map[string]*medialive.EventBridgeRuleTemplateGroup {
+	results := map[string]*medialive.EventBridgeRuleTemplateGroup{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *mediapackage.Channel:
+		case *medialive.EventBridgeRuleTemplateGroup:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaPackageChannelWithName retrieves all mediapackage.Channel items from an AWS CloudFormation template
+// GetMediaLiveEventBridgeRuleTemplateGroupWithName retrieves all medialive.EventBridgeRuleTemplateGroup items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaPackageChannelWithName(name string) (*mediapackage.Channel, error) {
+func (t *Template) GetMediaLiveEventBridgeRuleTemplateGroupWithName(name string) (*medialive.EventBridgeRuleTemplateGroup, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *mediapackage.Channel:
+		case *medialive.EventBridgeRuleTemplateGroup:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type mediapackage.Channel not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.EventBridgeRuleTemplateGroup not found", name)
 }
 
-// GetAllMediaPackageOriginEndpointResources retrieves all mediapackage.OriginEndpoint items from an AWS CloudFormation template
-func (t *Template) GetAllMediaPackageOriginEndpointResources() map[string]*mediapackage.OriginEndpoint {
-	results := map[string]*mediapackage.OriginEndpoint{}
+// GetAllMediaLiveInputResources retrieves all medialive.Input items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveInputResources() map[string]*medialive.Input {
+	results := map[string]*medialive.Input{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *mediapackage.OriginEndpoint:
+		case *medialive.Input:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaPackageOriginEndpointWithName retrieves all mediapackage.OriginEndpoint items from an AWS CloudFormation template
+// GetMediaLiveInputWithName retrieves all medialive.Input items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaPackageOriginEndpointWithName(name string) (*mediapackage.OriginEndpoint, error) {
+func (t *Template) GetMediaLiveInputWithName(name string) (*medialive.Input, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *mediapackage.OriginEndpoint:
+		case *medialive.Input:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type mediapackage.OriginEndpoint not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.Input not found", name)
 }
 
-// GetAllMediaPackagePackagingConfigurationResources retrieves all mediapackage.PackagingConfiguration items from an AWS CloudFormation template
-func (t *Template) GetAllMediaPackagePackagingConfigurationResources() map[string]*mediapackage.PackagingConfiguration {
-	results := map[string]*mediapackage.PackagingConfiguration{}
+// GetAllMediaLiveInputSecurityGroupResources retrieves all medialive.InputSecurityGroup items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveInputSecurityGroupResources() map[string]*medialive.InputSecurityGroup {
+	results := map[string]*medialive.InputSecurityGroup{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *mediapackage.PackagingConfiguration:
+		case *medialive.InputSecurityGroup:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaPackagePackagingConfigurationWithName retrieves all mediapackage.PackagingConfiguration items from an AWS CloudFormation template
+// GetMediaLiveInputSecurityGroupWithName retrieves all medialive.InputSecurityGroup items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaPackagePackagingConfigurationWithName(name string) (*mediapackage.PackagingConfiguration, error) {
+func (t *Template) GetMediaLiveInputSecurityGroupWithName(name string) (*medialive.InputSecurityGroup, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *mediapackage.PackagingConfiguration:
+		case *medialive.InputSecurityGroup:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type mediapackage.PackagingConfiguration not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.InputSecurityGroup not found", name)
 }
 
-// GetAllMediaPackagePackagingGroupResources retrieves all mediapackage.PackagingGroup items from an AWS CloudFormation template
-func (t *Template) GetAllMediaPackagePackagingGroupResources() map[string]*mediapackage.PackagingGroup {
-	results := map[string]*mediapackage.PackagingGroup{}
+// GetAllMediaLiveMultiplexResources retrieves all medialive.Multiplex items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveMultiplexResources() map[string]*medialive.Multiplex {
+	results := map[string]*medialive.Multiplex{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *mediapackage.PackagingGroup:
+		case *medialive.Multiplex:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetMediaPackagePackagingGroupWithName retrieves all mediapackage.PackagingGroup items from an AWS CloudFormation template
+// GetMediaLiveMultiplexWithName retrieves all medialive.Multiplex items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetMediaPackagePackagingGroupWithName(name string) (*mediapackage.PackagingGroup, error) {
+func (t *Template) GetMediaLiveMultiplexWithName(name string) (*medialive.Multiplex, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *mediapackage.PackagingGroup:
+		case *medialive.Multiplex:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type mediapackage.PackagingGroup not found", name)
+	return nil, fmt.Errorf("resource %q of type medialive.Multiplex not found", name)
+}
+
+// GetAllMediaLiveMultiplexprogramResources retrieves all medialive.Multiplexprogram items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveMultiplexprogramResources() map[string]*medialive.Multiplexprogram {
+	results := map[string]*medialive.Multiplexprogram{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *medialive.Multiplexprogram:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaLiveMultiplexprogramWithName retrieves all medialive.Multiplexprogram items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaLiveMultiplexprogramWithName(name string) (*medialive.Multiplexprogram, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *medialive.Multiplexprogram:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type medialive.Multiplexprogram not found", name)
+}
+
+// GetAllMediaLiveNetworkResources retrieves all medialive.Network items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveNetworkResources() map[string]*medialive.Network {
+	results := map[string]*medialive.Network{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *medialive.Network:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaLiveNetworkWithName retrieves all medialive.Network items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaLiveNetworkWithName(name string) (*medialive.Network, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *medialive.Network:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type medialive.Network not found", name)
+}
+
+// GetAllMediaLiveSdiSourceResources retrieves all medialive.SdiSource items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveSdiSourceResources() map[string]*medialive.SdiSource {
+	results := map[string]*medialive.SdiSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *medialive.SdiSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaLiveSdiSourceWithName retrieves all medialive.SdiSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaLiveSdiSourceWithName(name string) (*medialive.SdiSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *medialive.SdiSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type medialive.SdiSource not found", name)
+}
+
+// GetAllMediaLiveSignalMapResources retrieves all medialive.SignalMap items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveSignalMapResources() map[string]*medialive.SignalMap {
+	results := map[string]*medialive.SignalMap{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *medialive.SignalMap:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaLiveSignalMapWithName retrieves all medialive.SignalMap items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaLiveSignalMapWithName(name string) (*medialive.SignalMap, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *medialive.SignalMap:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type medialive.SignalMap not found", name)
+}
+
+// GetAllMediaPackageAssetResources retrieves all mediapackage.Asset items from an AWS CloudFormation template
+func (t *Template) GetAllMediaPackageAssetResources() map[string]*mediapackage.Asset {
+	results := map[string]*mediapackage.Asset{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediapackage.Asset:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaPackageAssetWithName retrieves all mediapackage.Asset items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaPackageAssetWithName(name string) (*mediapackage.Asset, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediapackage.Asset:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediapackage.Asset not found", name)
+}
+
+// GetAllMediaPackageChannelResources retrieves all mediapackage.Channel items from an AWS CloudFormation template
+func (t *Template) GetAllMediaPackageChannelResources() map[string]*mediapackage.Channel {
+	results := map[string]*mediapackage.Channel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediapackage.Channel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaPackageChannelWithName retrieves all mediapackage.Channel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaPackageChannelWithName(name string) (*mediapackage.Channel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediapackage.Channel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediapackage.Channel not found", name)
+}
+
+// GetAllMediaPackageOriginEndpointResources retrieves all mediapackage.OriginEndpoint items from an AWS CloudFormation template
+func (t *Template) GetAllMediaPackageOriginEndpointResources() map[string]*mediapackage.OriginEndpoint {
+	results := map[string]*mediapackage.OriginEndpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediapackage.OriginEndpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaPackageOriginEndpointWithName retrieves all mediapackage.OriginEndpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaPackageOriginEndpointWithName(name string) (*mediapackage.OriginEndpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediapackage.OriginEndpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediapackage.OriginEndpoint not found", name)
+}
+
+// GetAllMediaPackagePackagingConfigurationResources retrieves all mediapackage.PackagingConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllMediaPackagePackagingConfigurationResources() map[string]*mediapackage.PackagingConfiguration {
+	results := map[string]*mediapackage.PackagingConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediapackage.PackagingConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaPackagePackagingConfigurationWithName retrieves all mediapackage.PackagingConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaPackagePackagingConfigurationWithName(name string) (*mediapackage.PackagingConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediapackage.PackagingConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediapackage.PackagingConfiguration not found", name)
+}
+
+// GetAllMediaPackagePackagingGroupResources retrieves all mediapackage.PackagingGroup items from an AWS CloudFormation template
+func (t *Template) GetAllMediaPackagePackagingGroupResources() map[string]*mediapackage.PackagingGroup {
+	results := map[string]*mediapackage.PackagingGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediapackage.PackagingGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaPackagePackagingGroupWithName retrieves all mediapackage.PackagingGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaPackagePackagingGroupWithName(name string) (*mediapackage.PackagingGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediapackage.PackagingGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediapackage.PackagingGroup not found", name)
 }
 
 // GetAllMediaPackageV2ChannelResources retrieves all mediapackagev2.Channel items from an AWS CloudFormation template
@@ -22035,6 +22872,30 @@ func (t *Template) GetNeptuneDBSubnetGroupWithName(name string) (*neptune.DBSubn
 	return nil, fmt.Errorf("resource %q of type neptune.DBSubnetGroup not found", name)
 }
 
+// GetAllNeptuneEventSubscriptionResources retrieves all neptune.EventSubscription items from an AWS CloudFormation template
+func (t *Template) GetAllNeptuneEventSubscriptionResources() map[string]*neptune.EventSubscription {
+	results := map[string]*neptune.EventSubscription{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *neptune.EventSubscription:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNeptuneEventSubscriptionWithName retrieves all neptune.EventSubscription items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNeptuneEventSubscriptionWithName(name string) (*neptune.EventSubscription, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *neptune.EventSubscription:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type neptune.EventSubscription not found", name)
+}
+
 // GetAllNeptuneGraphGraphResources retrieves all neptunegraph.Graph items from an AWS CloudFormation template
 func (t *Template) GetAllNeptuneGraphGraphResources() map[string]*neptunegraph.Graph {
 	results := map[string]*neptunegraph.Graph{}
@@ -23451,6 +24312,54 @@ func (t *Template) GetPCAConnectorADTemplateGroupAccessControlEntryWithName(name
 	return nil, fmt.Errorf("resource %q of type pcaconnectorad.TemplateGroupAccessControlEntry not found", name)
 }
 
+// GetAllPCAConnectorSCEPChallengeResources retrieves all pcaconnectorscep.Challenge items from an AWS CloudFormation template
+func (t *Template) GetAllPCAConnectorSCEPChallengeResources() map[string]*pcaconnectorscep.Challenge {
+	results := map[string]*pcaconnectorscep.Challenge{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pcaconnectorscep.Challenge:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPCAConnectorSCEPChallengeWithName retrieves all pcaconnectorscep.Challenge items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPCAConnectorSCEPChallengeWithName(name string) (*pcaconnectorscep.Challenge, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pcaconnectorscep.Challenge:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pcaconnectorscep.Challenge not found", name)
+}
+
+// GetAllPCAConnectorSCEPConnectorResources retrieves all pcaconnectorscep.Connector items from an AWS CloudFormation template
+func (t *Template) GetAllPCAConnectorSCEPConnectorResources() map[string]*pcaconnectorscep.Connector {
+	results := map[string]*pcaconnectorscep.Connector{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pcaconnectorscep.Connector:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPCAConnectorSCEPConnectorWithName retrieves all pcaconnectorscep.Connector items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPCAConnectorSCEPConnectorWithName(name string) (*pcaconnectorscep.Connector, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pcaconnectorscep.Connector:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pcaconnectorscep.Connector not found", name)
+}
+
 // GetAllPanoramaApplicationInstanceResources retrieves all panorama.ApplicationInstance items from an AWS CloudFormation template
 func (t *Template) GetAllPanoramaApplicationInstanceResources() map[string]*panorama.ApplicationInstance {
 	results := map[string]*panorama.ApplicationInstance{}
@@ -24315,6 +25224,150 @@ func (t *Template) GetProtonServiceTemplateWithName(name string) (*proton.Servic
 	return nil, fmt.Errorf("resource %q of type proton.ServiceTemplate not found", name)
 }
 
+// GetAllQBusinessApplicationResources retrieves all qbusiness.Application items from an AWS CloudFormation template
+func (t *Template) GetAllQBusinessApplicationResources() map[string]*qbusiness.Application {
+	results := map[string]*qbusiness.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qbusiness.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQBusinessApplicationWithName retrieves all qbusiness.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQBusinessApplicationWithName(name string) (*qbusiness.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qbusiness.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qbusiness.Application not found", name)
+}
+
+// GetAllQBusinessDataSourceResources retrieves all qbusiness.DataSource items from an AWS CloudFormation template
+func (t *Template) GetAllQBusinessDataSourceResources() map[string]*qbusiness.DataSource {
+	results := map[string]*qbusiness.DataSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qbusiness.DataSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQBusinessDataSourceWithName retrieves all qbusiness.DataSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQBusinessDataSourceWithName(name string) (*qbusiness.DataSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qbusiness.DataSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qbusiness.DataSource not found", name)
+}
+
+// GetAllQBusinessIndexResources retrieves all qbusiness.Index items from an AWS CloudFormation template
+func (t *Template) GetAllQBusinessIndexResources() map[string]*qbusiness.Index {
+	results := map[string]*qbusiness.Index{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qbusiness.Index:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQBusinessIndexWithName retrieves all qbusiness.Index items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQBusinessIndexWithName(name string) (*qbusiness.Index, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qbusiness.Index:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qbusiness.Index not found", name)
+}
+
+// GetAllQBusinessPluginResources retrieves all qbusiness.Plugin items from an AWS CloudFormation template
+func (t *Template) GetAllQBusinessPluginResources() map[string]*qbusiness.Plugin {
+	results := map[string]*qbusiness.Plugin{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qbusiness.Plugin:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQBusinessPluginWithName retrieves all qbusiness.Plugin items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQBusinessPluginWithName(name string) (*qbusiness.Plugin, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qbusiness.Plugin:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qbusiness.Plugin not found", name)
+}
+
+// GetAllQBusinessRetrieverResources retrieves all qbusiness.Retriever items from an AWS CloudFormation template
+func (t *Template) GetAllQBusinessRetrieverResources() map[string]*qbusiness.Retriever {
+	results := map[string]*qbusiness.Retriever{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qbusiness.Retriever:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQBusinessRetrieverWithName retrieves all qbusiness.Retriever items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQBusinessRetrieverWithName(name string) (*qbusiness.Retriever, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qbusiness.Retriever:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qbusiness.Retriever not found", name)
+}
+
+// GetAllQBusinessWebExperienceResources retrieves all qbusiness.WebExperience items from an AWS CloudFormation template
+func (t *Template) GetAllQBusinessWebExperienceResources() map[string]*qbusiness.WebExperience {
+	results := map[string]*qbusiness.WebExperience{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qbusiness.WebExperience:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQBusinessWebExperienceWithName retrieves all qbusiness.WebExperience items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQBusinessWebExperienceWithName(name string) (*qbusiness.WebExperience, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qbusiness.WebExperience:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qbusiness.WebExperience not found", name)
+}
+
 // GetAllQLDBLedgerResources retrieves all qldb.Ledger items from an AWS CloudFormation template
 func (t *Template) GetAllQLDBLedgerResources() map[string]*qldb.Ledger {
 	results := map[string]*qldb.Ledger{}
@@ -24459,6 +25512,30 @@ func (t *Template) GetQuickSightDataSourceWithName(name string) (*quicksight.Dat
 	return nil, fmt.Errorf("resource %q of type quicksight.DataSource not found", name)
 }
 
+// GetAllQuickSightFolderResources retrieves all quicksight.Folder items from an AWS CloudFormation template
+func (t *Template) GetAllQuickSightFolderResources() map[string]*quicksight.Folder {
+	results := map[string]*quicksight.Folder{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *quicksight.Folder:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQuickSightFolderWithName retrieves all quicksight.Folder items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQuickSightFolderWithName(name string) (*quicksight.Folder, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *quicksight.Folder:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type quicksight.Folder not found", name)
+}
+
 // GetAllQuickSightRefreshScheduleResources retrieves all quicksight.RefreshSchedule items from an AWS CloudFormation template
 func (t *Template) GetAllQuickSightRefreshScheduleResources() map[string]*quicksight.RefreshSchedule {
 	results := map[string]*quicksight.RefreshSchedule{}
@@ -26979,100 +28056,268 @@ func (t *Template) GetSESConfigurationSetWithName(name string) (*ses.Configurati
 	return nil, fmt.Errorf("resource %q of type ses.ConfigurationSet not found", name)
 }
 
-// GetAllSESConfigurationSetEventDestinationResources retrieves all ses.ConfigurationSetEventDestination items from an AWS CloudFormation template
-func (t *Template) GetAllSESConfigurationSetEventDestinationResources() map[string]*ses.ConfigurationSetEventDestination {
-	results := map[string]*ses.ConfigurationSetEventDestination{}
+// GetAllSESConfigurationSetEventDestinationResources retrieves all ses.ConfigurationSetEventDestination items from an AWS CloudFormation template
+func (t *Template) GetAllSESConfigurationSetEventDestinationResources() map[string]*ses.ConfigurationSetEventDestination {
+	results := map[string]*ses.ConfigurationSetEventDestination{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.ConfigurationSetEventDestination:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESConfigurationSetEventDestinationWithName retrieves all ses.ConfigurationSetEventDestination items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESConfigurationSetEventDestinationWithName(name string) (*ses.ConfigurationSetEventDestination, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.ConfigurationSetEventDestination:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.ConfigurationSetEventDestination not found", name)
+}
+
+// GetAllSESContactListResources retrieves all ses.ContactList items from an AWS CloudFormation template
+func (t *Template) GetAllSESContactListResources() map[string]*ses.ContactList {
+	results := map[string]*ses.ContactList{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.ContactList:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESContactListWithName retrieves all ses.ContactList items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESContactListWithName(name string) (*ses.ContactList, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.ContactList:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.ContactList not found", name)
+}
+
+// GetAllSESDedicatedIpPoolResources retrieves all ses.DedicatedIpPool items from an AWS CloudFormation template
+func (t *Template) GetAllSESDedicatedIpPoolResources() map[string]*ses.DedicatedIpPool {
+	results := map[string]*ses.DedicatedIpPool{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.DedicatedIpPool:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESDedicatedIpPoolWithName retrieves all ses.DedicatedIpPool items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESDedicatedIpPoolWithName(name string) (*ses.DedicatedIpPool, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.DedicatedIpPool:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.DedicatedIpPool not found", name)
+}
+
+// GetAllSESEmailIdentityResources retrieves all ses.EmailIdentity items from an AWS CloudFormation template
+func (t *Template) GetAllSESEmailIdentityResources() map[string]*ses.EmailIdentity {
+	results := map[string]*ses.EmailIdentity{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.EmailIdentity:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESEmailIdentityWithName retrieves all ses.EmailIdentity items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESEmailIdentityWithName(name string) (*ses.EmailIdentity, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.EmailIdentity:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.EmailIdentity not found", name)
+}
+
+// GetAllSESMailManagerAddonInstanceResources retrieves all ses.MailManagerAddonInstance items from an AWS CloudFormation template
+func (t *Template) GetAllSESMailManagerAddonInstanceResources() map[string]*ses.MailManagerAddonInstance {
+	results := map[string]*ses.MailManagerAddonInstance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.MailManagerAddonInstance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESMailManagerAddonInstanceWithName retrieves all ses.MailManagerAddonInstance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESMailManagerAddonInstanceWithName(name string) (*ses.MailManagerAddonInstance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.MailManagerAddonInstance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.MailManagerAddonInstance not found", name)
+}
+
+// GetAllSESMailManagerAddonSubscriptionResources retrieves all ses.MailManagerAddonSubscription items from an AWS CloudFormation template
+func (t *Template) GetAllSESMailManagerAddonSubscriptionResources() map[string]*ses.MailManagerAddonSubscription {
+	results := map[string]*ses.MailManagerAddonSubscription{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.MailManagerAddonSubscription:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESMailManagerAddonSubscriptionWithName retrieves all ses.MailManagerAddonSubscription items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESMailManagerAddonSubscriptionWithName(name string) (*ses.MailManagerAddonSubscription, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.MailManagerAddonSubscription:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.MailManagerAddonSubscription not found", name)
+}
+
+// GetAllSESMailManagerArchiveResources retrieves all ses.MailManagerArchive items from an AWS CloudFormation template
+func (t *Template) GetAllSESMailManagerArchiveResources() map[string]*ses.MailManagerArchive {
+	results := map[string]*ses.MailManagerArchive{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.MailManagerArchive:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESMailManagerArchiveWithName retrieves all ses.MailManagerArchive items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESMailManagerArchiveWithName(name string) (*ses.MailManagerArchive, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.MailManagerArchive:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.MailManagerArchive not found", name)
+}
+
+// GetAllSESMailManagerIngressPointResources retrieves all ses.MailManagerIngressPoint items from an AWS CloudFormation template
+func (t *Template) GetAllSESMailManagerIngressPointResources() map[string]*ses.MailManagerIngressPoint {
+	results := map[string]*ses.MailManagerIngressPoint{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *ses.ConfigurationSetEventDestination:
+		case *ses.MailManagerIngressPoint:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetSESConfigurationSetEventDestinationWithName retrieves all ses.ConfigurationSetEventDestination items from an AWS CloudFormation template
+// GetSESMailManagerIngressPointWithName retrieves all ses.MailManagerIngressPoint items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetSESConfigurationSetEventDestinationWithName(name string) (*ses.ConfigurationSetEventDestination, error) {
+func (t *Template) GetSESMailManagerIngressPointWithName(name string) (*ses.MailManagerIngressPoint, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *ses.ConfigurationSetEventDestination:
+		case *ses.MailManagerIngressPoint:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type ses.ConfigurationSetEventDestination not found", name)
+	return nil, fmt.Errorf("resource %q of type ses.MailManagerIngressPoint not found", name)
 }
 
-// GetAllSESContactListResources retrieves all ses.ContactList items from an AWS CloudFormation template
-func (t *Template) GetAllSESContactListResources() map[string]*ses.ContactList {
-	results := map[string]*ses.ContactList{}
+// GetAllSESMailManagerRelayResources retrieves all ses.MailManagerRelay items from an AWS CloudFormation template
+func (t *Template) GetAllSESMailManagerRelayResources() map[string]*ses.MailManagerRelay {
+	results := map[string]*ses.MailManagerRelay{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *ses.ContactList:
+		case *ses.MailManagerRelay:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetSESContactListWithName retrieves all ses.ContactList items from an AWS CloudFormation template
+// GetSESMailManagerRelayWithName retrieves all ses.MailManagerRelay items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetSESContactListWithName(name string) (*ses.ContactList, error) {
+func (t *Template) GetSESMailManagerRelayWithName(name string) (*ses.MailManagerRelay, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *ses.ContactList:
+		case *ses.MailManagerRelay:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type ses.ContactList not found", name)
+	return nil, fmt.Errorf("resource %q of type ses.MailManagerRelay not found", name)
 }
 
-// GetAllSESDedicatedIpPoolResources retrieves all ses.DedicatedIpPool items from an AWS CloudFormation template
-func (t *Template) GetAllSESDedicatedIpPoolResources() map[string]*ses.DedicatedIpPool {
-	results := map[string]*ses.DedicatedIpPool{}
+// GetAllSESMailManagerRuleSetResources retrieves all ses.MailManagerRuleSet items from an AWS CloudFormation template
+func (t *Template) GetAllSESMailManagerRuleSetResources() map[string]*ses.MailManagerRuleSet {
+	results := map[string]*ses.MailManagerRuleSet{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *ses.DedicatedIpPool:
+		case *ses.MailManagerRuleSet:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetSESDedicatedIpPoolWithName retrieves all ses.DedicatedIpPool items from an AWS CloudFormation template
+// GetSESMailManagerRuleSetWithName retrieves all ses.MailManagerRuleSet items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetSESDedicatedIpPoolWithName(name string) (*ses.DedicatedIpPool, error) {
+func (t *Template) GetSESMailManagerRuleSetWithName(name string) (*ses.MailManagerRuleSet, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *ses.DedicatedIpPool:
+		case *ses.MailManagerRuleSet:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type ses.DedicatedIpPool not found", name)
+	return nil, fmt.Errorf("resource %q of type ses.MailManagerRuleSet not found", name)
 }
 
-// GetAllSESEmailIdentityResources retrieves all ses.EmailIdentity items from an AWS CloudFormation template
-func (t *Template) GetAllSESEmailIdentityResources() map[string]*ses.EmailIdentity {
-	results := map[string]*ses.EmailIdentity{}
+// GetAllSESMailManagerTrafficPolicyResources retrieves all ses.MailManagerTrafficPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllSESMailManagerTrafficPolicyResources() map[string]*ses.MailManagerTrafficPolicy {
+	results := map[string]*ses.MailManagerTrafficPolicy{}
 	for name, untyped := range t.Resources {
 		switch resource := untyped.(type) {
-		case *ses.EmailIdentity:
+		case *ses.MailManagerTrafficPolicy:
 			results[name] = resource
 		}
 	}
 	return results
 }
 
-// GetSESEmailIdentityWithName retrieves all ses.EmailIdentity items from an AWS CloudFormation template
+// GetSESMailManagerTrafficPolicyWithName retrieves all ses.MailManagerTrafficPolicy items from an AWS CloudFormation template
 // whose logical ID matches the provided name. Returns an error if not found.
-func (t *Template) GetSESEmailIdentityWithName(name string) (*ses.EmailIdentity, error) {
+func (t *Template) GetSESMailManagerTrafficPolicyWithName(name string) (*ses.MailManagerTrafficPolicy, error) {
 	if untyped, ok := t.Resources[name]; ok {
 		switch resource := untyped.(type) {
-		case *ses.EmailIdentity:
+		case *ses.MailManagerTrafficPolicy:
 			return resource, nil
 		}
 	}
-	return nil, fmt.Errorf("resource %q of type ses.EmailIdentity not found", name)
+	return nil, fmt.Errorf("resource %q of type ses.MailManagerTrafficPolicy not found", name)
 }
 
 // GetAllSESReceiptFilterResources retrieves all ses.ReceiptFilter items from an AWS CloudFormation template
@@ -27723,6 +28968,78 @@ func (t *Template) GetSSMIncidentsResponsePlanWithName(name string) (*ssminciden
 	return nil, fmt.Errorf("resource %q of type ssmincidents.ResponsePlan not found", name)
 }
 
+// GetAllSSMQuickSetupConfigurationManagerResources retrieves all ssmquicksetup.ConfigurationManager items from an AWS CloudFormation template
+func (t *Template) GetAllSSMQuickSetupConfigurationManagerResources() map[string]*ssmquicksetup.ConfigurationManager {
+	results := map[string]*ssmquicksetup.ConfigurationManager{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssmquicksetup.ConfigurationManager:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMQuickSetupConfigurationManagerWithName retrieves all ssmquicksetup.ConfigurationManager items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMQuickSetupConfigurationManagerWithName(name string) (*ssmquicksetup.ConfigurationManager, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssmquicksetup.ConfigurationManager:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssmquicksetup.ConfigurationManager not found", name)
+}
+
+// GetAllSSOApplicationResources retrieves all sso.Application items from an AWS CloudFormation template
+func (t *Template) GetAllSSOApplicationResources() map[string]*sso.Application {
+	results := map[string]*sso.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sso.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSOApplicationWithName retrieves all sso.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSOApplicationWithName(name string) (*sso.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sso.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sso.Application not found", name)
+}
+
+// GetAllSSOApplicationAssignmentResources retrieves all sso.ApplicationAssignment items from an AWS CloudFormation template
+func (t *Template) GetAllSSOApplicationAssignmentResources() map[string]*sso.ApplicationAssignment {
+	results := map[string]*sso.ApplicationAssignment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sso.ApplicationAssignment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSOApplicationAssignmentWithName retrieves all sso.ApplicationAssignment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSOApplicationAssignmentWithName(name string) (*sso.ApplicationAssignment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sso.ApplicationAssignment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sso.ApplicationAssignment not found", name)
+}
+
 // GetAllSSOAssignmentResources retrieves all sso.Assignment items from an AWS CloudFormation template
 func (t *Template) GetAllSSOAssignmentResources() map[string]*sso.Assignment {
 	results := map[string]*sso.Assignment{}
@@ -27747,6 +29064,30 @@ func (t *Template) GetSSOAssignmentWithName(name string) (*sso.Assignment, error
 	return nil, fmt.Errorf("resource %q of type sso.Assignment not found", name)
 }
 
+// GetAllSSOInstanceResources retrieves all sso.Instance items from an AWS CloudFormation template
+func (t *Template) GetAllSSOInstanceResources() map[string]*sso.Instance {
+	results := map[string]*sso.Instance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sso.Instance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSOInstanceWithName retrieves all sso.Instance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSOInstanceWithName(name string) (*sso.Instance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sso.Instance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sso.Instance not found", name)
+}
+
 // GetAllSSOInstanceAccessControlAttributeConfigurationResources retrieves all sso.InstanceAccessControlAttributeConfiguration items from an AWS CloudFormation template
 func (t *Template) GetAllSSOInstanceAccessControlAttributeConfigurationResources() map[string]*sso.InstanceAccessControlAttributeConfiguration {
 	results := map[string]*sso.InstanceAccessControlAttributeConfiguration{}
@@ -27843,6 +29184,30 @@ func (t *Template) GetSageMakerAppImageConfigWithName(name string) (*sagemaker.A
 	return nil, fmt.Errorf("resource %q of type sagemaker.AppImageConfig not found", name)
 }
 
+// GetAllSageMakerClusterResources retrieves all sagemaker.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerClusterResources() map[string]*sagemaker.Cluster {
+	results := map[string]*sagemaker.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerClusterWithName retrieves all sagemaker.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerClusterWithName(name string) (*sagemaker.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Cluster not found", name)
+}
+
 // GetAllSageMakerCodeRepositoryResources retrieves all sagemaker.CodeRepository items from an AWS CloudFormation template
 func (t *Template) GetAllSageMakerCodeRepositoryResources() map[string]*sagemaker.CodeRepository {
 	results := map[string]*sagemaker.CodeRepository{}
@@ -28131,6 +29496,30 @@ func (t *Template) GetSageMakerInferenceExperimentWithName(name string) (*sagema
 	return nil, fmt.Errorf("resource %q of type sagemaker.InferenceExperiment not found", name)
 }
 
+// GetAllSageMakerMlflowTrackingServerResources retrieves all sagemaker.MlflowTrackingServer items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerMlflowTrackingServerResources() map[string]*sagemaker.MlflowTrackingServer {
+	results := map[string]*sagemaker.MlflowTrackingServer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.MlflowTrackingServer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerMlflowTrackingServerWithName retrieves all sagemaker.MlflowTrackingServer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerMlflowTrackingServerWithName(name string) (*sagemaker.MlflowTrackingServer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.MlflowTrackingServer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.MlflowTrackingServer not found", name)
+}
+
 // GetAllSageMakerModelResources retrieves all sagemaker.Model items from an AWS CloudFormation template
 func (t *Template) GetAllSageMakerModelResources() map[string]*sagemaker.Model {
 	results := map[string]*sagemaker.Model{}
@@ -28443,6 +29832,30 @@ func (t *Template) GetSageMakerSpaceWithName(name string) (*sagemaker.Space, err
 	return nil, fmt.Errorf("resource %q of type sagemaker.Space not found", name)
 }
 
+// GetAllSageMakerStudioLifecycleConfigResources retrieves all sagemaker.StudioLifecycleConfig items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerStudioLifecycleConfigResources() map[string]*sagemaker.StudioLifecycleConfig {
+	results := map[string]*sagemaker.StudioLifecycleConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.StudioLifecycleConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerStudioLifecycleConfigWithName retrieves all sagemaker.StudioLifecycleConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerStudioLifecycleConfigWithName(name string) (*sagemaker.StudioLifecycleConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.StudioLifecycleConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.StudioLifecycleConfig not found", name)
+}
+
 // GetAllSageMakerUserProfileResources retrieves all sagemaker.UserProfile items from an AWS CloudFormation template
 func (t *Template) GetAllSageMakerUserProfileResources() map[string]*sagemaker.UserProfile {
 	results := map[string]*sagemaker.UserProfile{}
@@ -28659,6 +30072,30 @@ func (t *Template) GetSecurityHubAutomationRuleWithName(name string) (*securityh
 	return nil, fmt.Errorf("resource %q of type securityhub.AutomationRule not found", name)
 }
 
+// GetAllSecurityHubConfigurationPolicyResources retrieves all securityhub.ConfigurationPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllSecurityHubConfigurationPolicyResources() map[string]*securityhub.ConfigurationPolicy {
+	results := map[string]*securityhub.ConfigurationPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *securityhub.ConfigurationPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecurityHubConfigurationPolicyWithName retrieves all securityhub.ConfigurationPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecurityHubConfigurationPolicyWithName(name string) (*securityhub.ConfigurationPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *securityhub.ConfigurationPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type securityhub.ConfigurationPolicy not found", name)
+}
+
 // GetAllSecurityHubDelegatedAdminResources retrieves all securityhub.DelegatedAdmin items from an AWS CloudFormation template
 func (t *Template) GetAllSecurityHubDelegatedAdminResources() map[string]*securityhub.DelegatedAdmin {
 	results := map[string]*securityhub.DelegatedAdmin{}
@@ -28683,6 +30120,30 @@ func (t *Template) GetSecurityHubDelegatedAdminWithName(name string) (*securityh
 	return nil, fmt.Errorf("resource %q of type securityhub.DelegatedAdmin not found", name)
 }
 
+// GetAllSecurityHubFindingAggregatorResources retrieves all securityhub.FindingAggregator items from an AWS CloudFormation template
+func (t *Template) GetAllSecurityHubFindingAggregatorResources() map[string]*securityhub.FindingAggregator {
+	results := map[string]*securityhub.FindingAggregator{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *securityhub.FindingAggregator:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecurityHubFindingAggregatorWithName retrieves all securityhub.FindingAggregator items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecurityHubFindingAggregatorWithName(name string) (*securityhub.FindingAggregator, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *securityhub.FindingAggregator:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type securityhub.FindingAggregator not found", name)
+}
+
 // GetAllSecurityHubHubResources retrieves all securityhub.Hub items from an AWS CloudFormation template
 func (t *Template) GetAllSecurityHubHubResources() map[string]*securityhub.Hub {
 	results := map[string]*securityhub.Hub{}
@@ -28731,6 +30192,54 @@ func (t *Template) GetSecurityHubInsightWithName(name string) (*securityhub.Insi
 	return nil, fmt.Errorf("resource %q of type securityhub.Insight not found", name)
 }
 
+// GetAllSecurityHubOrganizationConfigurationResources retrieves all securityhub.OrganizationConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllSecurityHubOrganizationConfigurationResources() map[string]*securityhub.OrganizationConfiguration {
+	results := map[string]*securityhub.OrganizationConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *securityhub.OrganizationConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecurityHubOrganizationConfigurationWithName retrieves all securityhub.OrganizationConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecurityHubOrganizationConfigurationWithName(name string) (*securityhub.OrganizationConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *securityhub.OrganizationConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type securityhub.OrganizationConfiguration not found", name)
+}
+
+// GetAllSecurityHubPolicyAssociationResources retrieves all securityhub.PolicyAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllSecurityHubPolicyAssociationResources() map[string]*securityhub.PolicyAssociation {
+	results := map[string]*securityhub.PolicyAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *securityhub.PolicyAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecurityHubPolicyAssociationWithName retrieves all securityhub.PolicyAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecurityHubPolicyAssociationWithName(name string) (*securityhub.PolicyAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *securityhub.PolicyAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type securityhub.PolicyAssociation not found", name)
+}
+
 // GetAllSecurityHubProductSubscriptionResources retrieves all securityhub.ProductSubscription items from an AWS CloudFormation template
 func (t *Template) GetAllSecurityHubProductSubscriptionResources() map[string]*securityhub.ProductSubscription {
 	results := map[string]*securityhub.ProductSubscription{}
@@ -28755,6 +30264,30 @@ func (t *Template) GetSecurityHubProductSubscriptionWithName(name string) (*secu
 	return nil, fmt.Errorf("resource %q of type securityhub.ProductSubscription not found", name)
 }
 
+// GetAllSecurityHubSecurityControlResources retrieves all securityhub.SecurityControl items from an AWS CloudFormation template
+func (t *Template) GetAllSecurityHubSecurityControlResources() map[string]*securityhub.SecurityControl {
+	results := map[string]*securityhub.SecurityControl{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *securityhub.SecurityControl:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecurityHubSecurityControlWithName retrieves all securityhub.SecurityControl items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecurityHubSecurityControlWithName(name string) (*securityhub.SecurityControl, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *securityhub.SecurityControl:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type securityhub.SecurityControl not found", name)
+}
+
 // GetAllSecurityHubStandardResources retrieves all securityhub.Standard items from an AWS CloudFormation template
 func (t *Template) GetAllSecurityHubStandardResources() map[string]*securityhub.Standard {
 	results := map[string]*securityhub.Standard{}
@@ -28851,6 +30384,30 @@ func (t *Template) GetSecurityLakeSubscriberWithName(name string) (*securitylake
 	return nil, fmt.Errorf("resource %q of type securitylake.Subscriber not found", name)
 }
 
+// GetAllSecurityLakeSubscriberNotificationResources retrieves all securitylake.SubscriberNotification items from an AWS CloudFormation template
+func (t *Template) GetAllSecurityLakeSubscriberNotificationResources() map[string]*securitylake.SubscriberNotification {
+	results := map[string]*securitylake.SubscriberNotification{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *securitylake.SubscriberNotification:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecurityLakeSubscriberNotificationWithName retrieves all securitylake.SubscriberNotification items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecurityLakeSubscriberNotificationWithName(name string) (*securitylake.SubscriberNotification, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *securitylake.SubscriberNotification:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type securitylake.SubscriberNotification not found", name)
+}
+
 // GetAllServerlessApiResources retrieves all serverless.Api items from an AWS CloudFormation template
 func (t *Template) GetAllServerlessApiResources() map[string]*serverless.Api {
 	results := map[string]*serverless.Api{}
@@ -31347,6 +32904,30 @@ func (t *Template) GetWorkSpacesWorkspaceWithName(name string) (*workspaces.Work
 	return nil, fmt.Errorf("resource %q of type workspaces.Workspace not found", name)
 }
 
+// GetAllWorkSpacesWorkspacesPoolResources retrieves all workspaces.WorkspacesPool items from an AWS CloudFormation template
+func (t *Template) GetAllWorkSpacesWorkspacesPoolResources() map[string]*workspaces.WorkspacesPool {
+	results := map[string]*workspaces.WorkspacesPool{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *workspaces.WorkspacesPool:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWorkSpacesWorkspacesPoolWithName retrieves all workspaces.WorkspacesPool items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWorkSpacesWorkspacesPoolWithName(name string) (*workspaces.WorkspacesPool, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *workspaces.WorkspacesPool:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type workspaces.WorkspacesPool not found", name)
+}
+
 // GetAllWorkSpacesThinClientEnvironmentResources retrieves all workspacesthinclient.Environment items from an AWS CloudFormation template
 func (t *Template) GetAllWorkSpacesThinClientEnvironmentResources() map[string]*workspacesthinclient.Environment {
 	results := map[string]*workspacesthinclient.Environment{}
diff --git a/cloudformation/amazonmq/aws-amazonmq-broker.go b/cloudformation/amazonmq/aws-amazonmq-broker.go
index 87bef33715..1b38be3b6e 100644
--- a/cloudformation/amazonmq/aws-amazonmq-broker.go
+++ b/cloudformation/amazonmq/aws-amazonmq-broker.go
@@ -19,9 +19,9 @@ type Broker struct {
 	AuthenticationStrategy *string `json:"AuthenticationStrategy,omitempty"`
 
 	// AutoMinorVersionUpgrade AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-autominorversionupgrade
-	AutoMinorVersionUpgrade bool `json:"AutoMinorVersionUpgrade"`
+	AutoMinorVersionUpgrade *bool `json:"AutoMinorVersionUpgrade,omitempty"`
 
 	// BrokerName AWS CloudFormation Property
 	// Required: true
@@ -59,9 +59,9 @@ type Broker struct {
 	EngineType string `json:"EngineType"`
 
 	// EngineVersion AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-engineversion
-	EngineVersion string `json:"EngineVersion"`
+	EngineVersion *string `json:"EngineVersion,omitempty"`
 
 	// HostInstanceType AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/amazonmq/aws-amazonmq-configuration.go b/cloudformation/amazonmq/aws-amazonmq-configuration.go
index 24da4d8330..07096573bf 100644
--- a/cloudformation/amazonmq/aws-amazonmq-configuration.go
+++ b/cloudformation/amazonmq/aws-amazonmq-configuration.go
@@ -34,9 +34,9 @@ type Configuration struct {
 	EngineType string `json:"EngineType"`
 
 	// EngineVersion AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-engineversion
-	EngineVersion string `json:"EngineVersion"`
+	EngineVersion *string `json:"EngineVersion,omitempty"`
 
 	// Name AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/amplify/aws-amplify-app.go b/cloudformation/amplify/aws-amplify-app.go
index 6898fc4b87..014fe336e8 100644
--- a/cloudformation/amplify/aws-amplify-app.go
+++ b/cloudformation/amplify/aws-amplify-app.go
@@ -34,6 +34,11 @@ type App struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-buildspec
 	BuildSpec *string `json:"BuildSpec,omitempty"`
 
+	// CacheConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-cacheconfig
+	CacheConfig *App_CacheConfig `json:"CacheConfig,omitempty"`
+
 	// CustomHeaders AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-customheaders
diff --git a/cloudformation/amplify/aws-amplify-app_cacheconfig.go b/cloudformation/amplify/aws-amplify-app_cacheconfig.go
new file mode 100644
index 0000000000..cbc5b60ba3
--- /dev/null
+++ b/cloudformation/amplify/aws-amplify-app_cacheconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package amplify
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// App_CacheConfig AWS CloudFormation Resource (AWS::Amplify::App.CacheConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-cacheconfig.html
+type App_CacheConfig struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-cacheconfig.html#cfn-amplify-app-cacheconfig-type
+	Type *string `json:"Type,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 *App_CacheConfig) AWSCloudFormationType() string {
+	return "AWS::Amplify::App.CacheConfig"
+}
diff --git a/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go b/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
index 74e9a696e6..1986670a41 100644
--- a/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
+++ b/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
@@ -76,17 +76,17 @@ type Integration struct {
 	// RequestParameters AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-requestparameters
-	RequestParameters interface{} `json:"RequestParameters,omitempty"`
+	RequestParameters map[string]string `json:"RequestParameters,omitempty"`
 
 	// RequestTemplates AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-requesttemplates
-	RequestTemplates interface{} `json:"RequestTemplates,omitempty"`
+	RequestTemplates map[string]string `json:"RequestTemplates,omitempty"`
 
 	// ResponseParameters AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-responseparameters
-	ResponseParameters interface{} `json:"ResponseParameters,omitempty"`
+	ResponseParameters map[string]Integration_ResponseParameterMap `json:"ResponseParameters,omitempty"`
 
 	// TemplateSelectionExpression AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go b/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
index c0ce90f704..54155fa567 100644
--- a/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
+++ b/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
@@ -11,14 +11,14 @@ import (
 type Integration_ResponseParameter struct {
 
 	// Destination AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparameter.html#cfn-apigatewayv2-integration-responseparameter-destination
-	Destination string `json:"Destination"`
+	Destination *string `json:"Destination,omitempty"`
 
 	// Source AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparameter.html#cfn-apigatewayv2-integration-responseparameter-source
-	Source string `json:"Source"`
+	Source *string `json:"Source,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparametermap.go b/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparametermap.go
new file mode 100644
index 0000000000..d4bd1bdc74
--- /dev/null
+++ b/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparametermap.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apigatewayv2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Integration_ResponseParameterMap AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration.ResponseParameterMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparametermap.html
+type Integration_ResponseParameterMap struct {
+
+	// ResponseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparametermap.html#cfn-apigatewayv2-integration-responseparametermap-responseparameters
+	ResponseParameters []Integration_ResponseParameter `json:"ResponseParameters,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 *Integration_ResponseParameterMap) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Integration.ResponseParameterMap"
+}
diff --git a/cloudformation/appintegrations/aws-appintegrations-application.go b/cloudformation/appintegrations/aws-appintegrations-application.go
index fa7b0e09c7..1e445150a4 100644
--- a/cloudformation/appintegrations/aws-appintegrations-application.go
+++ b/cloudformation/appintegrations/aws-appintegrations-application.go
@@ -30,9 +30,9 @@ type Application struct {
 	Name string `json:"Name"`
 
 	// Namespace AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-application.html#cfn-appintegrations-application-namespace
-	Namespace *string `json:"Namespace,omitempty"`
+	Namespace string `json:"Namespace"`
 
 	// Permissions AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective.go
new file mode 100644
index 0000000000..a27571d85d
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective.go
@@ -0,0 +1,143 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// ServiceLevelObjective AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html
+type ServiceLevelObjective struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html#cfn-applicationsignals-servicelevelobjective-description
+	Description *string `json:"Description,omitempty"`
+
+	// Goal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html#cfn-applicationsignals-servicelevelobjective-goal
+	Goal *ServiceLevelObjective_Goal `json:"Goal,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html#cfn-applicationsignals-servicelevelobjective-name
+	Name string `json:"Name"`
+
+	// RequestBasedSli AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html#cfn-applicationsignals-servicelevelobjective-requestbasedsli
+	RequestBasedSli *ServiceLevelObjective_RequestBasedSli `json:"RequestBasedSli,omitempty"`
+
+	// Sli AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html#cfn-applicationsignals-servicelevelobjective-sli
+	Sli *ServiceLevelObjective_Sli `json:"Sli,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationsignals-servicelevelobjective.html#cfn-applicationsignals-servicelevelobjective-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 *ServiceLevelObjective) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective"
+}
+
+// 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 ServiceLevelObjective) MarshalJSON() ([]byte, error) {
+	type Properties ServiceLevelObjective
+	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 *ServiceLevelObjective) UnmarshalJSON(b []byte) error {
+	type Properties ServiceLevelObjective
+	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 = ServiceLevelObjective(*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/applicationsignals/aws-applicationsignals-servicelevelobjective_calendarinterval.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_calendarinterval.go
new file mode 100644
index 0000000000..5364f9360a
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_calendarinterval.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_CalendarInterval AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-calendarinterval.html
+type ServiceLevelObjective_CalendarInterval struct {
+
+	// Duration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-calendarinterval.html#cfn-applicationsignals-servicelevelobjective-calendarinterval-duration
+	Duration int `json:"Duration"`
+
+	// DurationUnit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-calendarinterval.html#cfn-applicationsignals-servicelevelobjective-calendarinterval-durationunit
+	DurationUnit string `json:"DurationUnit"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-calendarinterval.html#cfn-applicationsignals-servicelevelobjective-calendarinterval-starttime
+	StartTime int `json:"StartTime"`
+
+	// 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 *ServiceLevelObjective_CalendarInterval) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_dimension.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_dimension.go
new file mode 100644
index 0000000000..f491b4a1b2
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_dimension.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_Dimension AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.Dimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-dimension.html
+type ServiceLevelObjective_Dimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-dimension.html#cfn-applicationsignals-servicelevelobjective-dimension-name
+	Name string `json:"Name"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-dimension.html#cfn-applicationsignals-servicelevelobjective-dimension-value
+	Value string `json:"Value"`
+
+	// 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 *ServiceLevelObjective_Dimension) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.Dimension"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_goal.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_goal.go
new file mode 100644
index 0000000000..5e6dcf40b5
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_goal.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_Goal AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.Goal)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-goal.html
+type ServiceLevelObjective_Goal struct {
+
+	// AttainmentGoal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-goal.html#cfn-applicationsignals-servicelevelobjective-goal-attainmentgoal
+	AttainmentGoal *float64 `json:"AttainmentGoal,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-goal.html#cfn-applicationsignals-servicelevelobjective-goal-interval
+	Interval *ServiceLevelObjective_Interval `json:"Interval,omitempty"`
+
+	// WarningThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-goal.html#cfn-applicationsignals-servicelevelobjective-goal-warningthreshold
+	WarningThreshold *float64 `json:"WarningThreshold,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 *ServiceLevelObjective_Goal) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.Goal"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_interval.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_interval.go
new file mode 100644
index 0000000000..2f153f7ff5
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_interval.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_Interval AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.Interval)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-interval.html
+type ServiceLevelObjective_Interval struct {
+
+	// CalendarInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-interval.html#cfn-applicationsignals-servicelevelobjective-interval-calendarinterval
+	CalendarInterval *ServiceLevelObjective_CalendarInterval `json:"CalendarInterval,omitempty"`
+
+	// RollingInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-interval.html#cfn-applicationsignals-servicelevelobjective-interval-rollinginterval
+	RollingInterval *ServiceLevelObjective_RollingInterval `json:"RollingInterval,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 *ServiceLevelObjective_Interval) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.Interval"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metric.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metric.go
new file mode 100644
index 0000000000..49ba22c8c8
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metric.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_Metric AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.Metric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metric.html
+type ServiceLevelObjective_Metric struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metric.html#cfn-applicationsignals-servicelevelobjective-metric-dimensions
+	Dimensions []ServiceLevelObjective_Dimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metric.html#cfn-applicationsignals-servicelevelobjective-metric-metricname
+	MetricName *string `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metric.html#cfn-applicationsignals-servicelevelobjective-metric-namespace
+	Namespace *string `json:"Namespace,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 *ServiceLevelObjective_Metric) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.Metric"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricdataquery.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricdataquery.go
new file mode 100644
index 0000000000..e6d47a2ea2
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricdataquery.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_MetricDataQuery AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricdataquery.html
+type ServiceLevelObjective_MetricDataQuery struct {
+
+	// AccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricdataquery.html#cfn-applicationsignals-servicelevelobjective-metricdataquery-accountid
+	AccountId *string `json:"AccountId,omitempty"`
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricdataquery.html#cfn-applicationsignals-servicelevelobjective-metricdataquery-expression
+	Expression *string `json:"Expression,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricdataquery.html#cfn-applicationsignals-servicelevelobjective-metricdataquery-id
+	Id string `json:"Id"`
+
+	// MetricStat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricdataquery.html#cfn-applicationsignals-servicelevelobjective-metricdataquery-metricstat
+	MetricStat *ServiceLevelObjective_MetricStat `json:"MetricStat,omitempty"`
+
+	// ReturnData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricdataquery.html#cfn-applicationsignals-servicelevelobjective-metricdataquery-returndata
+	ReturnData *bool `json:"ReturnData,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 *ServiceLevelObjective_MetricDataQuery) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricstat.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricstat.go
new file mode 100644
index 0000000000..f2a32dd63d
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_metricstat.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_MetricStat AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.MetricStat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricstat.html
+type ServiceLevelObjective_MetricStat struct {
+
+	// Metric AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricstat.html#cfn-applicationsignals-servicelevelobjective-metricstat-metric
+	Metric *ServiceLevelObjective_Metric `json:"Metric"`
+
+	// Period AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricstat.html#cfn-applicationsignals-servicelevelobjective-metricstat-period
+	Period int `json:"Period"`
+
+	// Stat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricstat.html#cfn-applicationsignals-servicelevelobjective-metricstat-stat
+	Stat string `json:"Stat"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-metricstat.html#cfn-applicationsignals-servicelevelobjective-metricstat-unit
+	Unit *string `json:"Unit,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 *ServiceLevelObjective_MetricStat) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.MetricStat"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_monitoredrequestcountmetric.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_monitoredrequestcountmetric.go
new file mode 100644
index 0000000000..d31ef90cc9
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_monitoredrequestcountmetric.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_MonitoredRequestCountMetric AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-monitoredrequestcountmetric.html
+type ServiceLevelObjective_MonitoredRequestCountMetric struct {
+
+	// BadCountMetric AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-monitoredrequestcountmetric.html#cfn-applicationsignals-servicelevelobjective-monitoredrequestcountmetric-badcountmetric
+	BadCountMetric []ServiceLevelObjective_MetricDataQuery `json:"BadCountMetric,omitempty"`
+
+	// GoodCountMetric AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-monitoredrequestcountmetric.html#cfn-applicationsignals-servicelevelobjective-monitoredrequestcountmetric-goodcountmetric
+	GoodCountMetric []ServiceLevelObjective_MetricDataQuery `json:"GoodCountMetric,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 *ServiceLevelObjective_MonitoredRequestCountMetric) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedsli.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedsli.go
new file mode 100644
index 0000000000..4eefb0a552
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedsli.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_RequestBasedSli AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedsli.html
+type ServiceLevelObjective_RequestBasedSli struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedsli.html#cfn-applicationsignals-servicelevelobjective-requestbasedsli-comparisonoperator
+	ComparisonOperator *string `json:"ComparisonOperator,omitempty"`
+
+	// MetricThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedsli.html#cfn-applicationsignals-servicelevelobjective-requestbasedsli-metricthreshold
+	MetricThreshold *float64 `json:"MetricThreshold,omitempty"`
+
+	// RequestBasedSliMetric AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedsli.html#cfn-applicationsignals-servicelevelobjective-requestbasedsli-requestbasedslimetric
+	RequestBasedSliMetric *ServiceLevelObjective_RequestBasedSliMetric `json:"RequestBasedSliMetric"`
+
+	// 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 *ServiceLevelObjective_RequestBasedSli) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedslimetric.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedslimetric.go
new file mode 100644
index 0000000000..fe7d8f879f
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_requestbasedslimetric.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_RequestBasedSliMetric AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedslimetric.html
+type ServiceLevelObjective_RequestBasedSliMetric struct {
+
+	// KeyAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedslimetric.html#cfn-applicationsignals-servicelevelobjective-requestbasedslimetric-keyattributes
+	KeyAttributes map[string]string `json:"KeyAttributes,omitempty"`
+
+	// MetricType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedslimetric.html#cfn-applicationsignals-servicelevelobjective-requestbasedslimetric-metrictype
+	MetricType *string `json:"MetricType,omitempty"`
+
+	// MonitoredRequestCountMetric AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedslimetric.html#cfn-applicationsignals-servicelevelobjective-requestbasedslimetric-monitoredrequestcountmetric
+	MonitoredRequestCountMetric *ServiceLevelObjective_MonitoredRequestCountMetric `json:"MonitoredRequestCountMetric,omitempty"`
+
+	// OperationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedslimetric.html#cfn-applicationsignals-servicelevelobjective-requestbasedslimetric-operationname
+	OperationName *string `json:"OperationName,omitempty"`
+
+	// TotalRequestCountMetric AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-requestbasedslimetric.html#cfn-applicationsignals-servicelevelobjective-requestbasedslimetric-totalrequestcountmetric
+	TotalRequestCountMetric []ServiceLevelObjective_MetricDataQuery `json:"TotalRequestCountMetric,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 *ServiceLevelObjective_RequestBasedSliMetric) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_rollinginterval.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_rollinginterval.go
new file mode 100644
index 0000000000..7881fc1bf2
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_rollinginterval.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_RollingInterval AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-rollinginterval.html
+type ServiceLevelObjective_RollingInterval struct {
+
+	// Duration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-rollinginterval.html#cfn-applicationsignals-servicelevelobjective-rollinginterval-duration
+	Duration int `json:"Duration"`
+
+	// DurationUnit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-rollinginterval.html#cfn-applicationsignals-servicelevelobjective-rollinginterval-durationunit
+	DurationUnit string `json:"DurationUnit"`
+
+	// 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 *ServiceLevelObjective_RollingInterval) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_sli.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_sli.go
new file mode 100644
index 0000000000..ba2645a479
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_sli.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_Sli AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.Sli)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-sli.html
+type ServiceLevelObjective_Sli struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-sli.html#cfn-applicationsignals-servicelevelobjective-sli-comparisonoperator
+	ComparisonOperator string `json:"ComparisonOperator"`
+
+	// MetricThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-sli.html#cfn-applicationsignals-servicelevelobjective-sli-metricthreshold
+	MetricThreshold float64 `json:"MetricThreshold"`
+
+	// SliMetric AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-sli.html#cfn-applicationsignals-servicelevelobjective-sli-slimetric
+	SliMetric *ServiceLevelObjective_SliMetric `json:"SliMetric"`
+
+	// 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 *ServiceLevelObjective_Sli) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.Sli"
+}
diff --git a/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_slimetric.go b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_slimetric.go
new file mode 100644
index 0000000000..7371fc1a7b
--- /dev/null
+++ b/cloudformation/applicationsignals/aws-applicationsignals-servicelevelobjective_slimetric.go
@@ -0,0 +1,62 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package applicationsignals
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ServiceLevelObjective_SliMetric AWS CloudFormation Resource (AWS::ApplicationSignals::ServiceLevelObjective.SliMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-slimetric.html
+type ServiceLevelObjective_SliMetric struct {
+
+	// KeyAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-slimetric.html#cfn-applicationsignals-servicelevelobjective-slimetric-keyattributes
+	KeyAttributes map[string]string `json:"KeyAttributes,omitempty"`
+
+	// MetricDataQueries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-slimetric.html#cfn-applicationsignals-servicelevelobjective-slimetric-metricdataqueries
+	MetricDataQueries []ServiceLevelObjective_MetricDataQuery `json:"MetricDataQueries,omitempty"`
+
+	// MetricType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-slimetric.html#cfn-applicationsignals-servicelevelobjective-slimetric-metrictype
+	MetricType *string `json:"MetricType,omitempty"`
+
+	// OperationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-slimetric.html#cfn-applicationsignals-servicelevelobjective-slimetric-operationname
+	OperationName *string `json:"OperationName,omitempty"`
+
+	// PeriodSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-slimetric.html#cfn-applicationsignals-servicelevelobjective-slimetric-periodseconds
+	PeriodSeconds *int `json:"PeriodSeconds,omitempty"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationsignals-servicelevelobjective-slimetric.html#cfn-applicationsignals-servicelevelobjective-slimetric-statistic
+	Statistic *string `json:"Statistic,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 *ServiceLevelObjective_SliMetric) AWSCloudFormationType() string {
+	return "AWS::ApplicationSignals::ServiceLevelObjective.SliMetric"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase.go b/cloudformation/apptest/aws-apptest-testcase.go
new file mode 100644
index 0000000000..e12db5ca73
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase AWS CloudFormation Resource (AWS::AppTest::TestCase)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apptest-testcase.html
+type TestCase struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apptest-testcase.html#cfn-apptest-testcase-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apptest-testcase.html#cfn-apptest-testcase-name
+	Name string `json:"Name"`
+
+	// Steps AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apptest-testcase.html#cfn-apptest-testcase-steps
+	Steps []TestCase_Step `json:"Steps"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apptest-testcase.html#cfn-apptest-testcase-tags
+	Tags map[string]string `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 *TestCase) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase"
+}
+
+// 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 TestCase) MarshalJSON() ([]byte, error) {
+	type Properties TestCase
+	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 *TestCase) UnmarshalJSON(b []byte) error {
+	type Properties TestCase
+	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 = TestCase(*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/apptest/aws-apptest-testcase_batch.go b/cloudformation/apptest/aws-apptest-testcase_batch.go
new file mode 100644
index 0000000000..81ec4d0e18
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_batch.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_Batch AWS CloudFormation Resource (AWS::AppTest::TestCase.Batch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-batch.html
+type TestCase_Batch struct {
+
+	// BatchJobName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-batch.html#cfn-apptest-testcase-batch-batchjobname
+	BatchJobName string `json:"BatchJobName"`
+
+	// BatchJobParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-batch.html#cfn-apptest-testcase-batch-batchjobparameters
+	BatchJobParameters map[string]string `json:"BatchJobParameters,omitempty"`
+
+	// ExportDataSetNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-batch.html#cfn-apptest-testcase-batch-exportdatasetnames
+	ExportDataSetNames []string `json:"ExportDataSetNames,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 *TestCase_Batch) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.Batch"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_cloudformationaction.go b/cloudformation/apptest/aws-apptest-testcase_cloudformationaction.go
new file mode 100644
index 0000000000..65bb32aa00
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_cloudformationaction.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_CloudFormationAction AWS CloudFormation Resource (AWS::AppTest::TestCase.CloudFormationAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-cloudformationaction.html
+type TestCase_CloudFormationAction struct {
+
+	// ActionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-cloudformationaction.html#cfn-apptest-testcase-cloudformationaction-actiontype
+	ActionType *string `json:"ActionType,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-cloudformationaction.html#cfn-apptest-testcase-cloudformationaction-resource
+	Resource string `json:"Resource"`
+
+	// 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 *TestCase_CloudFormationAction) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.CloudFormationAction"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_compareaction.go b/cloudformation/apptest/aws-apptest-testcase_compareaction.go
new file mode 100644
index 0000000000..8bbb3e972a
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_compareaction.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_CompareAction AWS CloudFormation Resource (AWS::AppTest::TestCase.CompareAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-compareaction.html
+type TestCase_CompareAction struct {
+
+	// Input AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-compareaction.html#cfn-apptest-testcase-compareaction-input
+	Input *TestCase_Input `json:"Input"`
+
+	// Output AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-compareaction.html#cfn-apptest-testcase-compareaction-output
+	Output *TestCase_Output `json:"Output,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 *TestCase_CompareAction) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.CompareAction"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_databasecdc.go b/cloudformation/apptest/aws-apptest-testcase_databasecdc.go
new file mode 100644
index 0000000000..ef9222cf2e
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_databasecdc.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_DatabaseCDC AWS CloudFormation Resource (AWS::AppTest::TestCase.DatabaseCDC)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-databasecdc.html
+type TestCase_DatabaseCDC struct {
+
+	// SourceMetadata AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-databasecdc.html#cfn-apptest-testcase-databasecdc-sourcemetadata
+	SourceMetadata *TestCase_SourceDatabaseMetadata `json:"SourceMetadata"`
+
+	// TargetMetadata AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-databasecdc.html#cfn-apptest-testcase-databasecdc-targetmetadata
+	TargetMetadata *TestCase_TargetDatabaseMetadata `json:"TargetMetadata"`
+
+	// 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 *TestCase_DatabaseCDC) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.DatabaseCDC"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_dataset.go b/cloudformation/apptest/aws-apptest-testcase_dataset.go
new file mode 100644
index 0000000000..815957d632
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_dataset.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_DataSet AWS CloudFormation Resource (AWS::AppTest::TestCase.DataSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-dataset.html
+type TestCase_DataSet struct {
+
+	// Ccsid AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-dataset.html#cfn-apptest-testcase-dataset-ccsid
+	Ccsid string `json:"Ccsid"`
+
+	// Format AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-dataset.html#cfn-apptest-testcase-dataset-format
+	Format string `json:"Format"`
+
+	// Length AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-dataset.html#cfn-apptest-testcase-dataset-length
+	Length float64 `json:"Length"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-dataset.html#cfn-apptest-testcase-dataset-name
+	Name string `json:"Name"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-dataset.html#cfn-apptest-testcase-dataset-type
+	Type string `json:"Type"`
+
+	// 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 *TestCase_DataSet) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.DataSet"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_filemetadata.go b/cloudformation/apptest/aws-apptest-testcase_filemetadata.go
new file mode 100644
index 0000000000..1d72b26850
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_filemetadata.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_FileMetadata AWS CloudFormation Resource (AWS::AppTest::TestCase.FileMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-filemetadata.html
+type TestCase_FileMetadata struct {
+
+	// DataSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-filemetadata.html#cfn-apptest-testcase-filemetadata-datasets
+	DataSets []TestCase_DataSet `json:"DataSets,omitempty"`
+
+	// DatabaseCDC AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-filemetadata.html#cfn-apptest-testcase-filemetadata-databasecdc
+	DatabaseCDC *TestCase_DatabaseCDC `json:"DatabaseCDC,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 *TestCase_FileMetadata) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.FileMetadata"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_input.go b/cloudformation/apptest/aws-apptest-testcase_input.go
new file mode 100644
index 0000000000..092fdc87e6
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_input.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_Input AWS CloudFormation Resource (AWS::AppTest::TestCase.Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-input.html
+type TestCase_Input struct {
+
+	// File AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-input.html#cfn-apptest-testcase-input-file
+	File *TestCase_InputFile `json:"File"`
+
+	// 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 *TestCase_Input) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.Input"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_inputfile.go b/cloudformation/apptest/aws-apptest-testcase_inputfile.go
new file mode 100644
index 0000000000..17a24ed46e
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_inputfile.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_InputFile AWS CloudFormation Resource (AWS::AppTest::TestCase.InputFile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-inputfile.html
+type TestCase_InputFile struct {
+
+	// FileMetadata AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-inputfile.html#cfn-apptest-testcase-inputfile-filemetadata
+	FileMetadata *TestCase_FileMetadata `json:"FileMetadata"`
+
+	// SourceLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-inputfile.html#cfn-apptest-testcase-inputfile-sourcelocation
+	SourceLocation string `json:"SourceLocation"`
+
+	// TargetLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-inputfile.html#cfn-apptest-testcase-inputfile-targetlocation
+	TargetLocation string `json:"TargetLocation"`
+
+	// 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 *TestCase_InputFile) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.InputFile"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_m2managedactionproperties.go b/cloudformation/apptest/aws-apptest-testcase_m2managedactionproperties.go
new file mode 100644
index 0000000000..17681964d5
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_m2managedactionproperties.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_M2ManagedActionProperties AWS CloudFormation Resource (AWS::AppTest::TestCase.M2ManagedActionProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2managedactionproperties.html
+type TestCase_M2ManagedActionProperties struct {
+
+	// ForceStop AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2managedactionproperties.html#cfn-apptest-testcase-m2managedactionproperties-forcestop
+	ForceStop *bool `json:"ForceStop,omitempty"`
+
+	// ImportDataSetLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2managedactionproperties.html#cfn-apptest-testcase-m2managedactionproperties-importdatasetlocation
+	ImportDataSetLocation *string `json:"ImportDataSetLocation,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 *TestCase_M2ManagedActionProperties) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.M2ManagedActionProperties"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_m2managedapplicationaction.go b/cloudformation/apptest/aws-apptest-testcase_m2managedapplicationaction.go
new file mode 100644
index 0000000000..2dc6fca0c4
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_m2managedapplicationaction.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_M2ManagedApplicationAction AWS CloudFormation Resource (AWS::AppTest::TestCase.M2ManagedApplicationAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2managedapplicationaction.html
+type TestCase_M2ManagedApplicationAction struct {
+
+	// ActionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2managedapplicationaction.html#cfn-apptest-testcase-m2managedapplicationaction-actiontype
+	ActionType string `json:"ActionType"`
+
+	// Properties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2managedapplicationaction.html#cfn-apptest-testcase-m2managedapplicationaction-properties
+	Properties *TestCase_M2ManagedActionProperties `json:"Properties,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2managedapplicationaction.html#cfn-apptest-testcase-m2managedapplicationaction-resource
+	Resource string `json:"Resource"`
+
+	// 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 *TestCase_M2ManagedApplicationAction) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.M2ManagedApplicationAction"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_m2nonmanagedapplicationaction.go b/cloudformation/apptest/aws-apptest-testcase_m2nonmanagedapplicationaction.go
new file mode 100644
index 0000000000..8f4996621a
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_m2nonmanagedapplicationaction.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_M2NonManagedApplicationAction AWS CloudFormation Resource (AWS::AppTest::TestCase.M2NonManagedApplicationAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2nonmanagedapplicationaction.html
+type TestCase_M2NonManagedApplicationAction struct {
+
+	// ActionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2nonmanagedapplicationaction.html#cfn-apptest-testcase-m2nonmanagedapplicationaction-actiontype
+	ActionType string `json:"ActionType"`
+
+	// Resource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-m2nonmanagedapplicationaction.html#cfn-apptest-testcase-m2nonmanagedapplicationaction-resource
+	Resource string `json:"Resource"`
+
+	// 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 *TestCase_M2NonManagedApplicationAction) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.M2NonManagedApplicationAction"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_mainframeaction.go b/cloudformation/apptest/aws-apptest-testcase_mainframeaction.go
new file mode 100644
index 0000000000..4aec62ca73
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_mainframeaction.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_MainframeAction AWS CloudFormation Resource (AWS::AppTest::TestCase.MainframeAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeaction.html
+type TestCase_MainframeAction struct {
+
+	// ActionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeaction.html#cfn-apptest-testcase-mainframeaction-actiontype
+	ActionType *TestCase_MainframeActionType `json:"ActionType"`
+
+	// Properties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeaction.html#cfn-apptest-testcase-mainframeaction-properties
+	Properties *TestCase_MainframeActionProperties `json:"Properties,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeaction.html#cfn-apptest-testcase-mainframeaction-resource
+	Resource string `json:"Resource"`
+
+	// 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 *TestCase_MainframeAction) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.MainframeAction"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_mainframeactionproperties.go b/cloudformation/apptest/aws-apptest-testcase_mainframeactionproperties.go
new file mode 100644
index 0000000000..cebb7248ae
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_mainframeactionproperties.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_MainframeActionProperties AWS CloudFormation Resource (AWS::AppTest::TestCase.MainframeActionProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeactionproperties.html
+type TestCase_MainframeActionProperties struct {
+
+	// DmsTaskArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeactionproperties.html#cfn-apptest-testcase-mainframeactionproperties-dmstaskarn
+	DmsTaskArn *string `json:"DmsTaskArn,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 *TestCase_MainframeActionProperties) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.MainframeActionProperties"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_mainframeactiontype.go b/cloudformation/apptest/aws-apptest-testcase_mainframeactiontype.go
new file mode 100644
index 0000000000..6edeedbb33
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_mainframeactiontype.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_MainframeActionType AWS CloudFormation Resource (AWS::AppTest::TestCase.MainframeActionType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeactiontype.html
+type TestCase_MainframeActionType struct {
+
+	// Batch AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeactiontype.html#cfn-apptest-testcase-mainframeactiontype-batch
+	Batch *TestCase_Batch `json:"Batch,omitempty"`
+
+	// Tn3270 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-mainframeactiontype.html#cfn-apptest-testcase-mainframeactiontype-tn3270
+	Tn3270 *TestCase_TN3270 `json:"Tn3270,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 *TestCase_MainframeActionType) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.MainframeActionType"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_output.go b/cloudformation/apptest/aws-apptest-testcase_output.go
new file mode 100644
index 0000000000..af2516d331
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_output.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_Output AWS CloudFormation Resource (AWS::AppTest::TestCase.Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-output.html
+type TestCase_Output struct {
+
+	// File AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-output.html#cfn-apptest-testcase-output-file
+	File *TestCase_OutputFile `json:"File"`
+
+	// 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 *TestCase_Output) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.Output"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_outputfile.go b/cloudformation/apptest/aws-apptest-testcase_outputfile.go
new file mode 100644
index 0000000000..7f1411608d
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_outputfile.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_OutputFile AWS CloudFormation Resource (AWS::AppTest::TestCase.OutputFile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-outputfile.html
+type TestCase_OutputFile struct {
+
+	// FileLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-outputfile.html#cfn-apptest-testcase-outputfile-filelocation
+	FileLocation *string `json:"FileLocation,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 *TestCase_OutputFile) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.OutputFile"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_resourceaction.go b/cloudformation/apptest/aws-apptest-testcase_resourceaction.go
new file mode 100644
index 0000000000..9c819b6064
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_resourceaction.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_ResourceAction AWS CloudFormation Resource (AWS::AppTest::TestCase.ResourceAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-resourceaction.html
+type TestCase_ResourceAction struct {
+
+	// CloudFormationAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-resourceaction.html#cfn-apptest-testcase-resourceaction-cloudformationaction
+	CloudFormationAction *TestCase_CloudFormationAction `json:"CloudFormationAction,omitempty"`
+
+	// M2ManagedApplicationAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-resourceaction.html#cfn-apptest-testcase-resourceaction-m2managedapplicationaction
+	M2ManagedApplicationAction *TestCase_M2ManagedApplicationAction `json:"M2ManagedApplicationAction,omitempty"`
+
+	// M2NonManagedApplicationAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-resourceaction.html#cfn-apptest-testcase-resourceaction-m2nonmanagedapplicationaction
+	M2NonManagedApplicationAction *TestCase_M2NonManagedApplicationAction `json:"M2NonManagedApplicationAction,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 *TestCase_ResourceAction) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.ResourceAction"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_script.go b/cloudformation/apptest/aws-apptest-testcase_script.go
new file mode 100644
index 0000000000..34c82f87e4
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_script.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_Script AWS CloudFormation Resource (AWS::AppTest::TestCase.Script)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-script.html
+type TestCase_Script struct {
+
+	// ScriptLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-script.html#cfn-apptest-testcase-script-scriptlocation
+	ScriptLocation string `json:"ScriptLocation"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-script.html#cfn-apptest-testcase-script-type
+	Type string `json:"Type"`
+
+	// 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 *TestCase_Script) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.Script"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_sourcedatabasemetadata.go b/cloudformation/apptest/aws-apptest-testcase_sourcedatabasemetadata.go
new file mode 100644
index 0000000000..f2d367b925
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_sourcedatabasemetadata.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_SourceDatabaseMetadata AWS CloudFormation Resource (AWS::AppTest::TestCase.SourceDatabaseMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-sourcedatabasemetadata.html
+type TestCase_SourceDatabaseMetadata struct {
+
+	// CaptureTool AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-sourcedatabasemetadata.html#cfn-apptest-testcase-sourcedatabasemetadata-capturetool
+	CaptureTool string `json:"CaptureTool"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-sourcedatabasemetadata.html#cfn-apptest-testcase-sourcedatabasemetadata-type
+	Type string `json:"Type"`
+
+	// 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 *TestCase_SourceDatabaseMetadata) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.SourceDatabaseMetadata"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_step.go b/cloudformation/apptest/aws-apptest-testcase_step.go
new file mode 100644
index 0000000000..2d4da4a5f4
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_step.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_Step AWS CloudFormation Resource (AWS::AppTest::TestCase.Step)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-step.html
+type TestCase_Step struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-step.html#cfn-apptest-testcase-step-action
+	Action *TestCase_StepAction `json:"Action"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-step.html#cfn-apptest-testcase-step-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-step.html#cfn-apptest-testcase-step-name
+	Name string `json:"Name"`
+
+	// 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 *TestCase_Step) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.Step"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_stepaction.go b/cloudformation/apptest/aws-apptest-testcase_stepaction.go
new file mode 100644
index 0000000000..0e16cdd53d
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_stepaction.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_StepAction AWS CloudFormation Resource (AWS::AppTest::TestCase.StepAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-stepaction.html
+type TestCase_StepAction struct {
+
+	// CompareAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-stepaction.html#cfn-apptest-testcase-stepaction-compareaction
+	CompareAction *TestCase_CompareAction `json:"CompareAction,omitempty"`
+
+	// MainframeAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-stepaction.html#cfn-apptest-testcase-stepaction-mainframeaction
+	MainframeAction *TestCase_MainframeAction `json:"MainframeAction,omitempty"`
+
+	// ResourceAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-stepaction.html#cfn-apptest-testcase-stepaction-resourceaction
+	ResourceAction *TestCase_ResourceAction `json:"ResourceAction,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 *TestCase_StepAction) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.StepAction"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_targetdatabasemetadata.go b/cloudformation/apptest/aws-apptest-testcase_targetdatabasemetadata.go
new file mode 100644
index 0000000000..6efaa85382
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_targetdatabasemetadata.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_TargetDatabaseMetadata AWS CloudFormation Resource (AWS::AppTest::TestCase.TargetDatabaseMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-targetdatabasemetadata.html
+type TestCase_TargetDatabaseMetadata struct {
+
+	// CaptureTool AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-targetdatabasemetadata.html#cfn-apptest-testcase-targetdatabasemetadata-capturetool
+	CaptureTool string `json:"CaptureTool"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-targetdatabasemetadata.html#cfn-apptest-testcase-targetdatabasemetadata-type
+	Type string `json:"Type"`
+
+	// 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 *TestCase_TargetDatabaseMetadata) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.TargetDatabaseMetadata"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_testcaselatestversion.go b/cloudformation/apptest/aws-apptest-testcase_testcaselatestversion.go
new file mode 100644
index 0000000000..9a31262303
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_testcaselatestversion.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_TestCaseLatestVersion AWS CloudFormation Resource (AWS::AppTest::TestCase.TestCaseLatestVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-testcaselatestversion.html
+type TestCase_TestCaseLatestVersion struct {
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-testcaselatestversion.html#cfn-apptest-testcase-testcaselatestversion-status
+	Status string `json:"Status"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-testcaselatestversion.html#cfn-apptest-testcase-testcaselatestversion-version
+	Version float64 `json:"Version"`
+
+	// 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 *TestCase_TestCaseLatestVersion) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.TestCaseLatestVersion"
+}
diff --git a/cloudformation/apptest/aws-apptest-testcase_tn3270.go b/cloudformation/apptest/aws-apptest-testcase_tn3270.go
new file mode 100644
index 0000000000..89bbdeeaf6
--- /dev/null
+++ b/cloudformation/apptest/aws-apptest-testcase_tn3270.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package apptest
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TestCase_TN3270 AWS CloudFormation Resource (AWS::AppTest::TestCase.TN3270)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-tn3270.html
+type TestCase_TN3270 struct {
+
+	// ExportDataSetNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-tn3270.html#cfn-apptest-testcase-tn3270-exportdatasetnames
+	ExportDataSetNames []string `json:"ExportDataSetNames,omitempty"`
+
+	// Script AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apptest-testcase-tn3270.html#cfn-apptest-testcase-tn3270-script
+	Script *TestCase_Script `json:"Script"`
+
+	// 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 *TestCase_TN3270) AWSCloudFormationType() string {
+	return "AWS::AppTest::TestCase.TN3270"
+}
diff --git a/cloudformation/arczonalshift/aws-arczonalshift-autoshiftobservernotificationstatus.go b/cloudformation/arczonalshift/aws-arczonalshift-autoshiftobservernotificationstatus.go
new file mode 100644
index 0000000000..4b200df88d
--- /dev/null
+++ b/cloudformation/arczonalshift/aws-arczonalshift-autoshiftobservernotificationstatus.go
@@ -0,0 +1,117 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package arczonalshift
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// AutoshiftObserverNotificationStatus AWS CloudFormation Resource (AWS::ARCZonalShift::AutoshiftObserverNotificationStatus)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-arczonalshift-autoshiftobservernotificationstatus.html
+type AutoshiftObserverNotificationStatus struct {
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-arczonalshift-autoshiftobservernotificationstatus.html#cfn-arczonalshift-autoshiftobservernotificationstatus-status
+	Status string `json:"Status"`
+
+	// 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 *AutoshiftObserverNotificationStatus) AWSCloudFormationType() string {
+	return "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+}
+
+// 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 AutoshiftObserverNotificationStatus) MarshalJSON() ([]byte, error) {
+	type Properties AutoshiftObserverNotificationStatus
+	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 *AutoshiftObserverNotificationStatus) UnmarshalJSON(b []byte) error {
+	type Properties AutoshiftObserverNotificationStatus
+	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 = AutoshiftObserverNotificationStatus(*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/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go b/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
index f78c682ccf..142f10e3ca 100644
--- a/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
+++ b/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
@@ -16,19 +16,24 @@ type ScalingPolicy_CustomizedMetricSpecification struct {
 	Dimensions []ScalingPolicy_MetricDimension `json:"Dimensions,omitempty"`
 
 	// MetricName AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-metricname
-	MetricName string `json:"MetricName"`
+	MetricName *string `json:"MetricName,omitempty"`
+
+	// Metrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-metrics
+	Metrics []ScalingPolicy_TargetTrackingMetricDataQuery `json:"Metrics,omitempty"`
 
 	// Namespace AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-namespace
-	Namespace string `json:"Namespace"`
+	Namespace *string `json:"Namespace,omitempty"`
 
 	// Statistic AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-statistic
-	Statistic string `json:"Statistic"`
+	Statistic *string `json:"Statistic,omitempty"`
 
 	// Unit AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricdataquery.go b/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricdataquery.go
new file mode 100644
index 0000000000..525a86cb8a
--- /dev/null
+++ b/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricdataquery.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package autoscaling
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ScalingPolicy_TargetTrackingMetricDataQuery AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricdataquery.html
+type ScalingPolicy_TargetTrackingMetricDataQuery struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricdataquery.html#cfn-autoscaling-scalingpolicy-targettrackingmetricdataquery-expression
+	Expression *string `json:"Expression,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricdataquery.html#cfn-autoscaling-scalingpolicy-targettrackingmetricdataquery-id
+	Id string `json:"Id"`
+
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricdataquery.html#cfn-autoscaling-scalingpolicy-targettrackingmetricdataquery-label
+	Label *string `json:"Label,omitempty"`
+
+	// MetricStat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricdataquery.html#cfn-autoscaling-scalingpolicy-targettrackingmetricdataquery-metricstat
+	MetricStat *ScalingPolicy_TargetTrackingMetricStat `json:"MetricStat,omitempty"`
+
+	// ReturnData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricdataquery.html#cfn-autoscaling-scalingpolicy-targettrackingmetricdataquery-returndata
+	ReturnData *bool `json:"ReturnData,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 *ScalingPolicy_TargetTrackingMetricDataQuery) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery"
+}
diff --git a/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricstat.go b/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricstat.go
new file mode 100644
index 0000000000..decf17cc12
--- /dev/null
+++ b/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingmetricstat.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package autoscaling
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ScalingPolicy_TargetTrackingMetricStat AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricstat.html
+type ScalingPolicy_TargetTrackingMetricStat struct {
+
+	// Metric AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricstat.html#cfn-autoscaling-scalingpolicy-targettrackingmetricstat-metric
+	Metric *ScalingPolicy_Metric `json:"Metric"`
+
+	// Stat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricstat.html#cfn-autoscaling-scalingpolicy-targettrackingmetricstat-stat
+	Stat string `json:"Stat"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingmetricstat.html#cfn-autoscaling-scalingpolicy-targettrackingmetricstat-unit
+	Unit *string `json:"Unit,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 *ScalingPolicy_TargetTrackingMetricStat) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-capability_ediconfiguration.go b/cloudformation/b2bi/aws-b2bi-capability_ediconfiguration.go
index 5165461005..c257855586 100644
--- a/cloudformation/b2bi/aws-b2bi-capability_ediconfiguration.go
+++ b/cloudformation/b2bi/aws-b2bi-capability_ediconfiguration.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-capability-ediconfiguration.html
 type Capability_EdiConfiguration struct {
 
+	// CapabilityDirection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-capability-ediconfiguration.html#cfn-b2bi-capability-ediconfiguration-capabilitydirection
+	CapabilityDirection *string `json:"CapabilityDirection,omitempty"`
+
 	// InputLocation AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-capability-ediconfiguration.html#cfn-b2bi-capability-ediconfiguration-inputlocation
diff --git a/cloudformation/b2bi/aws-b2bi-partnership.go b/cloudformation/b2bi/aws-b2bi-partnership.go
index d43cfdb6ac..c60b40db84 100644
--- a/cloudformation/b2bi/aws-b2bi-partnership.go
+++ b/cloudformation/b2bi/aws-b2bi-partnership.go
@@ -15,9 +15,14 @@ import (
 type Partnership struct {
 
 	// Capabilities AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-partnership.html#cfn-b2bi-partnership-capabilities
-	Capabilities []string `json:"Capabilities,omitempty"`
+	Capabilities []string `json:"Capabilities"`
+
+	// CapabilityOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-partnership.html#cfn-b2bi-partnership-capabilityoptions
+	CapabilityOptions *Partnership_CapabilityOptions `json:"CapabilityOptions,omitempty"`
 
 	// Email AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/b2bi/aws-b2bi-partnership_capabilityoptions.go b/cloudformation/b2bi/aws-b2bi-partnership_capabilityoptions.go
new file mode 100644
index 0000000000..fcf5b956a9
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-partnership_capabilityoptions.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Partnership_CapabilityOptions AWS CloudFormation Resource (AWS::B2BI::Partnership.CapabilityOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-capabilityoptions.html
+type Partnership_CapabilityOptions struct {
+
+	// OutboundEdi AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-capabilityoptions.html#cfn-b2bi-partnership-capabilityoptions-outboundedi
+	OutboundEdi *Partnership_OutboundEdiOptions `json:"OutboundEdi,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 *Partnership_CapabilityOptions) AWSCloudFormationType() string {
+	return "AWS::B2BI::Partnership.CapabilityOptions"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-partnership_outboundedioptions.go b/cloudformation/b2bi/aws-b2bi-partnership_outboundedioptions.go
new file mode 100644
index 0000000000..ffcf5a8820
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-partnership_outboundedioptions.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Partnership_OutboundEdiOptions AWS CloudFormation Resource (AWS::B2BI::Partnership.OutboundEdiOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-outboundedioptions.html
+type Partnership_OutboundEdiOptions struct {
+
+	// X12 AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-outboundedioptions.html#cfn-b2bi-partnership-outboundedioptions-x12
+	X12 *Partnership_X12Envelope `json:"X12"`
+
+	// 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 *Partnership_OutboundEdiOptions) AWSCloudFormationType() string {
+	return "AWS::B2BI::Partnership.OutboundEdiOptions"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-partnership_x12delimiters.go b/cloudformation/b2bi/aws-b2bi-partnership_x12delimiters.go
new file mode 100644
index 0000000000..1cc02d4cc5
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-partnership_x12delimiters.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Partnership_X12Delimiters AWS CloudFormation Resource (AWS::B2BI::Partnership.X12Delimiters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12delimiters.html
+type Partnership_X12Delimiters struct {
+
+	// ComponentSeparator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12delimiters.html#cfn-b2bi-partnership-x12delimiters-componentseparator
+	ComponentSeparator *string `json:"ComponentSeparator,omitempty"`
+
+	// DataElementSeparator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12delimiters.html#cfn-b2bi-partnership-x12delimiters-dataelementseparator
+	DataElementSeparator *string `json:"DataElementSeparator,omitempty"`
+
+	// SegmentTerminator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12delimiters.html#cfn-b2bi-partnership-x12delimiters-segmentterminator
+	SegmentTerminator *string `json:"SegmentTerminator,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 *Partnership_X12Delimiters) AWSCloudFormationType() string {
+	return "AWS::B2BI::Partnership.X12Delimiters"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-partnership_x12envelope.go b/cloudformation/b2bi/aws-b2bi-partnership_x12envelope.go
new file mode 100644
index 0000000000..39d85fb609
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-partnership_x12envelope.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Partnership_X12Envelope AWS CloudFormation Resource (AWS::B2BI::Partnership.X12Envelope)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12envelope.html
+type Partnership_X12Envelope struct {
+
+	// Common AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12envelope.html#cfn-b2bi-partnership-x12envelope-common
+	Common *Partnership_X12OutboundEdiHeaders `json:"Common,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 *Partnership_X12Envelope) AWSCloudFormationType() string {
+	return "AWS::B2BI::Partnership.X12Envelope"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-partnership_x12functionalgroupheaders.go b/cloudformation/b2bi/aws-b2bi-partnership_x12functionalgroupheaders.go
new file mode 100644
index 0000000000..5c5ce05f50
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-partnership_x12functionalgroupheaders.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Partnership_X12FunctionalGroupHeaders AWS CloudFormation Resource (AWS::B2BI::Partnership.X12FunctionalGroupHeaders)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12functionalgroupheaders.html
+type Partnership_X12FunctionalGroupHeaders struct {
+
+	// ApplicationReceiverCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12functionalgroupheaders.html#cfn-b2bi-partnership-x12functionalgroupheaders-applicationreceivercode
+	ApplicationReceiverCode *string `json:"ApplicationReceiverCode,omitempty"`
+
+	// ApplicationSenderCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12functionalgroupheaders.html#cfn-b2bi-partnership-x12functionalgroupheaders-applicationsendercode
+	ApplicationSenderCode *string `json:"ApplicationSenderCode,omitempty"`
+
+	// ResponsibleAgencyCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12functionalgroupheaders.html#cfn-b2bi-partnership-x12functionalgroupheaders-responsibleagencycode
+	ResponsibleAgencyCode *string `json:"ResponsibleAgencyCode,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 *Partnership_X12FunctionalGroupHeaders) AWSCloudFormationType() string {
+	return "AWS::B2BI::Partnership.X12FunctionalGroupHeaders"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-partnership_x12interchangecontrolheaders.go b/cloudformation/b2bi/aws-b2bi-partnership_x12interchangecontrolheaders.go
new file mode 100644
index 0000000000..c69de9c2df
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-partnership_x12interchangecontrolheaders.go
@@ -0,0 +1,67 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Partnership_X12InterchangeControlHeaders AWS CloudFormation Resource (AWS::B2BI::Partnership.X12InterchangeControlHeaders)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html
+type Partnership_X12InterchangeControlHeaders struct {
+
+	// AcknowledgmentRequestedCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html#cfn-b2bi-partnership-x12interchangecontrolheaders-acknowledgmentrequestedcode
+	AcknowledgmentRequestedCode *string `json:"AcknowledgmentRequestedCode,omitempty"`
+
+	// ReceiverId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html#cfn-b2bi-partnership-x12interchangecontrolheaders-receiverid
+	ReceiverId *string `json:"ReceiverId,omitempty"`
+
+	// ReceiverIdQualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html#cfn-b2bi-partnership-x12interchangecontrolheaders-receiveridqualifier
+	ReceiverIdQualifier *string `json:"ReceiverIdQualifier,omitempty"`
+
+	// RepetitionSeparator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html#cfn-b2bi-partnership-x12interchangecontrolheaders-repetitionseparator
+	RepetitionSeparator *string `json:"RepetitionSeparator,omitempty"`
+
+	// SenderId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html#cfn-b2bi-partnership-x12interchangecontrolheaders-senderid
+	SenderId *string `json:"SenderId,omitempty"`
+
+	// SenderIdQualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html#cfn-b2bi-partnership-x12interchangecontrolheaders-senderidqualifier
+	SenderIdQualifier *string `json:"SenderIdQualifier,omitempty"`
+
+	// UsageIndicatorCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12interchangecontrolheaders.html#cfn-b2bi-partnership-x12interchangecontrolheaders-usageindicatorcode
+	UsageIndicatorCode *string `json:"UsageIndicatorCode,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 *Partnership_X12InterchangeControlHeaders) AWSCloudFormationType() string {
+	return "AWS::B2BI::Partnership.X12InterchangeControlHeaders"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-partnership_x12outboundediheaders.go b/cloudformation/b2bi/aws-b2bi-partnership_x12outboundediheaders.go
new file mode 100644
index 0000000000..26a65e87ac
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-partnership_x12outboundediheaders.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Partnership_X12OutboundEdiHeaders AWS CloudFormation Resource (AWS::B2BI::Partnership.X12OutboundEdiHeaders)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12outboundediheaders.html
+type Partnership_X12OutboundEdiHeaders struct {
+
+	// Delimiters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12outboundediheaders.html#cfn-b2bi-partnership-x12outboundediheaders-delimiters
+	Delimiters *Partnership_X12Delimiters `json:"Delimiters,omitempty"`
+
+	// FunctionalGroupHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12outboundediheaders.html#cfn-b2bi-partnership-x12outboundediheaders-functionalgroupheaders
+	FunctionalGroupHeaders *Partnership_X12FunctionalGroupHeaders `json:"FunctionalGroupHeaders,omitempty"`
+
+	// InterchangeControlHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12outboundediheaders.html#cfn-b2bi-partnership-x12outboundediheaders-interchangecontrolheaders
+	InterchangeControlHeaders *Partnership_X12InterchangeControlHeaders `json:"InterchangeControlHeaders,omitempty"`
+
+	// ValidateEdi AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-partnership-x12outboundediheaders.html#cfn-b2bi-partnership-x12outboundediheaders-validateedi
+	ValidateEdi *bool `json:"ValidateEdi,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 *Partnership_X12OutboundEdiHeaders) AWSCloudFormationType() string {
+	return "AWS::B2BI::Partnership.X12OutboundEdiHeaders"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-transformer.go b/cloudformation/b2bi/aws-b2bi-transformer.go
index 2b15cf1c98..7ab4ff964f 100644
--- a/cloudformation/b2bi/aws-b2bi-transformer.go
+++ b/cloudformation/b2bi/aws-b2bi-transformer.go
@@ -14,30 +14,30 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html
 type Transformer struct {
 
-	// EdiType AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-editype
-	EdiType *Transformer_EdiType `json:"EdiType"`
-
-	// FileFormat AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-fileformat
-	FileFormat string `json:"FileFormat"`
+	// InputConversion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-inputconversion
+	InputConversion *Transformer_InputConversion `json:"InputConversion,omitempty"`
 
-	// MappingTemplate AWS CloudFormation Property
-	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-mappingtemplate
-	MappingTemplate string `json:"MappingTemplate"`
+	// Mapping AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-mapping
+	Mapping *Transformer_Mapping `json:"Mapping,omitempty"`
 
 	// Name AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-name
 	Name string `json:"Name"`
 
-	// SampleDocument AWS CloudFormation Property
+	// OutputConversion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-outputconversion
+	OutputConversion *Transformer_OutputConversion `json:"OutputConversion,omitempty"`
+
+	// SampleDocuments AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-sampledocument
-	SampleDocument *string `json:"SampleDocument,omitempty"`
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-b2bi-transformer.html#cfn-b2bi-transformer-sampledocuments
+	SampleDocuments *Transformer_SampleDocuments `json:"SampleDocuments,omitempty"`
 
 	// Status AWS CloudFormation Property
 	// Required: true
diff --git a/cloudformation/b2bi/aws-b2bi-transformer_formatoptions.go b/cloudformation/b2bi/aws-b2bi-transformer_formatoptions.go
new file mode 100644
index 0000000000..21188c8db5
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-transformer_formatoptions.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Transformer_FormatOptions AWS CloudFormation Resource (AWS::B2BI::Transformer.FormatOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-formatoptions.html
+type Transformer_FormatOptions struct {
+
+	// X12 AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-formatoptions.html#cfn-b2bi-transformer-formatoptions-x12
+	X12 *Transformer_X12Details `json:"X12"`
+
+	// 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 *Transformer_FormatOptions) AWSCloudFormationType() string {
+	return "AWS::B2BI::Transformer.FormatOptions"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-transformer_inputconversion.go b/cloudformation/b2bi/aws-b2bi-transformer_inputconversion.go
new file mode 100644
index 0000000000..a000d121e2
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-transformer_inputconversion.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Transformer_InputConversion AWS CloudFormation Resource (AWS::B2BI::Transformer.InputConversion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-inputconversion.html
+type Transformer_InputConversion struct {
+
+	// FormatOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-inputconversion.html#cfn-b2bi-transformer-inputconversion-formatoptions
+	FormatOptions *Transformer_FormatOptions `json:"FormatOptions,omitempty"`
+
+	// FromFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-inputconversion.html#cfn-b2bi-transformer-inputconversion-fromformat
+	FromFormat string `json:"FromFormat"`
+
+	// 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 *Transformer_InputConversion) AWSCloudFormationType() string {
+	return "AWS::B2BI::Transformer.InputConversion"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-transformer_mapping.go b/cloudformation/b2bi/aws-b2bi-transformer_mapping.go
new file mode 100644
index 0000000000..b62b85bb69
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-transformer_mapping.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Transformer_Mapping AWS CloudFormation Resource (AWS::B2BI::Transformer.Mapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-mapping.html
+type Transformer_Mapping struct {
+
+	// Template AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-mapping.html#cfn-b2bi-transformer-mapping-template
+	Template *string `json:"Template,omitempty"`
+
+	// TemplateLanguage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-mapping.html#cfn-b2bi-transformer-mapping-templatelanguage
+	TemplateLanguage string `json:"TemplateLanguage"`
+
+	// 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 *Transformer_Mapping) AWSCloudFormationType() string {
+	return "AWS::B2BI::Transformer.Mapping"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-transformer_outputconversion.go b/cloudformation/b2bi/aws-b2bi-transformer_outputconversion.go
new file mode 100644
index 0000000000..9ac35c4c66
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-transformer_outputconversion.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Transformer_OutputConversion AWS CloudFormation Resource (AWS::B2BI::Transformer.OutputConversion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-outputconversion.html
+type Transformer_OutputConversion struct {
+
+	// FormatOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-outputconversion.html#cfn-b2bi-transformer-outputconversion-formatoptions
+	FormatOptions *Transformer_FormatOptions `json:"FormatOptions,omitempty"`
+
+	// ToFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-outputconversion.html#cfn-b2bi-transformer-outputconversion-toformat
+	ToFormat string `json:"ToFormat"`
+
+	// 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 *Transformer_OutputConversion) AWSCloudFormationType() string {
+	return "AWS::B2BI::Transformer.OutputConversion"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-transformer_sampledocumentkeys.go b/cloudformation/b2bi/aws-b2bi-transformer_sampledocumentkeys.go
new file mode 100644
index 0000000000..04e627c956
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-transformer_sampledocumentkeys.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Transformer_SampleDocumentKeys AWS CloudFormation Resource (AWS::B2BI::Transformer.SampleDocumentKeys)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-sampledocumentkeys.html
+type Transformer_SampleDocumentKeys struct {
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-sampledocumentkeys.html#cfn-b2bi-transformer-sampledocumentkeys-input
+	Input *string `json:"Input,omitempty"`
+
+	// Output AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-sampledocumentkeys.html#cfn-b2bi-transformer-sampledocumentkeys-output
+	Output *string `json:"Output,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 *Transformer_SampleDocumentKeys) AWSCloudFormationType() string {
+	return "AWS::B2BI::Transformer.SampleDocumentKeys"
+}
diff --git a/cloudformation/b2bi/aws-b2bi-transformer_sampledocuments.go b/cloudformation/b2bi/aws-b2bi-transformer_sampledocuments.go
new file mode 100644
index 0000000000..663db1a915
--- /dev/null
+++ b/cloudformation/b2bi/aws-b2bi-transformer_sampledocuments.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package b2bi
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Transformer_SampleDocuments AWS CloudFormation Resource (AWS::B2BI::Transformer.SampleDocuments)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-sampledocuments.html
+type Transformer_SampleDocuments struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-sampledocuments.html#cfn-b2bi-transformer-sampledocuments-bucketname
+	BucketName string `json:"BucketName"`
+
+	// Keys AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-b2bi-transformer-sampledocuments.html#cfn-b2bi-transformer-sampledocuments-keys
+	Keys []Transformer_SampleDocumentKeys `json:"Keys"`
+
+	// 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 *Transformer_SampleDocuments) AWSCloudFormationType() string {
+	return "AWS::B2BI::Transformer.SampleDocuments"
+}
diff --git a/cloudformation/backup/aws-backup-restoretestingplan.go b/cloudformation/backup/aws-backup-restoretestingplan.go
index 3507cac192..75050190e5 100644
--- a/cloudformation/backup/aws-backup-restoretestingplan.go
+++ b/cloudformation/backup/aws-backup-restoretestingplan.go
@@ -34,6 +34,11 @@ type RestoreTestingPlan struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-restoretestingplan.html#cfn-backup-restoretestingplan-scheduleexpressiontimezone
 	ScheduleExpressionTimezone *string `json:"ScheduleExpressionTimezone,omitempty"`
 
+	// ScheduleStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-restoretestingplan.html#cfn-backup-restoretestingplan-schedulestatus
+	ScheduleStatus *string `json:"ScheduleStatus,omitempty"`
+
 	// StartWindowHours AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-restoretestingplan.html#cfn-backup-restoretestingplan-startwindowhours
diff --git a/cloudformation/batch/aws-batch-computeenvironment.go b/cloudformation/batch/aws-batch-computeenvironment.go
index 6d0bc707c2..8b74c6778d 100644
--- a/cloudformation/batch/aws-batch-computeenvironment.go
+++ b/cloudformation/batch/aws-batch-computeenvironment.go
@@ -23,6 +23,11 @@ type ComputeEnvironment struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeresources
 	ComputeResources *ComputeEnvironment_ComputeResources `json:"ComputeResources,omitempty"`
 
+	// Context AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-context
+	Context *string `json:"Context,omitempty"`
+
 	// EksConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-eksconfiguration
diff --git a/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go b/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
index 050993449c..cc0b312c00 100644
--- a/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
+++ b/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
@@ -20,6 +20,11 @@ type JobDefinition_NodeRangeProperty struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-noderangeproperty.html#cfn-batch-jobdefinition-noderangeproperty-ecsproperties
 	EcsProperties *JobDefinition_EcsProperties `json:"EcsProperties,omitempty"`
 
+	// EksProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-noderangeproperty.html#cfn-batch-jobdefinition-noderangeproperty-eksproperties
+	EksProperties *JobDefinition_EksProperties `json:"EksProperties,omitempty"`
+
 	// InstanceTypes AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-noderangeproperty.html#cfn-batch-jobdefinition-noderangeproperty-instancetypes
diff --git a/cloudformation/bedrock/aws-bedrock-agent.go b/cloudformation/bedrock/aws-bedrock-agent.go
index 3614a1b5cc..95d17cb357 100644
--- a/cloudformation/bedrock/aws-bedrock-agent.go
+++ b/cloudformation/bedrock/aws-bedrock-agent.go
@@ -48,6 +48,11 @@ type Agent struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-agent.html#cfn-bedrock-agent-foundationmodel
 	FoundationModel *string `json:"FoundationModel,omitempty"`
 
+	// GuardrailConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-agent.html#cfn-bedrock-agent-guardrailconfiguration
+	GuardrailConfiguration *Agent_GuardrailConfiguration `json:"GuardrailConfiguration,omitempty"`
+
 	// IdleSessionTTLInSeconds AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-agent.html#cfn-bedrock-agent-idlesessionttlinseconds
diff --git a/cloudformation/bedrock/aws-bedrock-agent_actiongroupexecutor.go b/cloudformation/bedrock/aws-bedrock-agent_actiongroupexecutor.go
index aaa108b44a..b766c2d33d 100644
--- a/cloudformation/bedrock/aws-bedrock-agent_actiongroupexecutor.go
+++ b/cloudformation/bedrock/aws-bedrock-agent_actiongroupexecutor.go
@@ -10,10 +10,15 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-actiongroupexecutor.html
 type Agent_ActionGroupExecutor struct {
 
+	// CustomControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-actiongroupexecutor.html#cfn-bedrock-agent-actiongroupexecutor-customcontrol
+	CustomControl *string `json:"CustomControl,omitempty"`
+
 	// Lambda AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-actiongroupexecutor.html#cfn-bedrock-agent-actiongroupexecutor-lambda
-	Lambda string `json:"Lambda"`
+	Lambda *string `json:"Lambda,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/bedrock/aws-bedrock-agent_agentactiongroup.go b/cloudformation/bedrock/aws-bedrock-agent_agentactiongroup.go
index 5383beb8f2..59c0c9ee95 100644
--- a/cloudformation/bedrock/aws-bedrock-agent_agentactiongroup.go
+++ b/cloudformation/bedrock/aws-bedrock-agent_agentactiongroup.go
@@ -35,6 +35,11 @@ type Agent_AgentActionGroup struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-agentactiongroup.html#cfn-bedrock-agent-agentactiongroup-description
 	Description *string `json:"Description,omitempty"`
 
+	// FunctionSchema AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-agentactiongroup.html#cfn-bedrock-agent-agentactiongroup-functionschema
+	FunctionSchema *Agent_FunctionSchema `json:"FunctionSchema,omitempty"`
+
 	// ParentActionGroupSignature AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-agentactiongroup.html#cfn-bedrock-agent-agentactiongroup-parentactiongroupsignature
diff --git a/cloudformation/bedrock/aws-bedrock-agent_function.go b/cloudformation/bedrock/aws-bedrock-agent_function.go
new file mode 100644
index 0000000000..d605b18189
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-agent_function.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Agent_Function AWS CloudFormation Resource (AWS::Bedrock::Agent.Function)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-function.html
+type Agent_Function struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-function.html#cfn-bedrock-agent-function-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-function.html#cfn-bedrock-agent-function-name
+	Name string `json:"Name"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-function.html#cfn-bedrock-agent-function-parameters
+	Parameters map[string]Agent_ParameterDetail `json:"Parameters,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 *Agent_Function) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Agent.Function"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-agent_functionschema.go b/cloudformation/bedrock/aws-bedrock-agent_functionschema.go
new file mode 100644
index 0000000000..3ebc9f9efa
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-agent_functionschema.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Agent_FunctionSchema AWS CloudFormation Resource (AWS::Bedrock::Agent.FunctionSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-functionschema.html
+type Agent_FunctionSchema struct {
+
+	// Functions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-functionschema.html#cfn-bedrock-agent-functionschema-functions
+	Functions []Agent_Function `json:"Functions"`
+
+	// 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 *Agent_FunctionSchema) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Agent.FunctionSchema"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-agent_guardrailconfiguration.go b/cloudformation/bedrock/aws-bedrock-agent_guardrailconfiguration.go
new file mode 100644
index 0000000000..ebf5e34295
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-agent_guardrailconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Agent_GuardrailConfiguration AWS CloudFormation Resource (AWS::Bedrock::Agent.GuardrailConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-guardrailconfiguration.html
+type Agent_GuardrailConfiguration struct {
+
+	// GuardrailIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-guardrailconfiguration.html#cfn-bedrock-agent-guardrailconfiguration-guardrailidentifier
+	GuardrailIdentifier *string `json:"GuardrailIdentifier,omitempty"`
+
+	// GuardrailVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-guardrailconfiguration.html#cfn-bedrock-agent-guardrailconfiguration-guardrailversion
+	GuardrailVersion *string `json:"GuardrailVersion,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 *Agent_GuardrailConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Agent.GuardrailConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-agent_parameterdetail.go b/cloudformation/bedrock/aws-bedrock-agent_parameterdetail.go
new file mode 100644
index 0000000000..18e1438475
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-agent_parameterdetail.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Agent_ParameterDetail AWS CloudFormation Resource (AWS::Bedrock::Agent.ParameterDetail)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-parameterdetail.html
+type Agent_ParameterDetail struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-parameterdetail.html#cfn-bedrock-agent-parameterdetail-description
+	Description *string `json:"Description,omitempty"`
+
+	// Required AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-parameterdetail.html#cfn-bedrock-agent-parameterdetail-required
+	Required *bool `json:"Required,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-agent-parameterdetail.html#cfn-bedrock-agent-parameterdetail-type
+	Type string `json:"Type"`
+
+	// 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 *Agent_ParameterDetail) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Agent.ParameterDetail"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource.go b/cloudformation/bedrock/aws-bedrock-datasource.go
index b3a89e98f0..73b4740b3d 100644
--- a/cloudformation/bedrock/aws-bedrock-datasource.go
+++ b/cloudformation/bedrock/aws-bedrock-datasource.go
@@ -13,6 +13,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-datasource.html
 type DataSource struct {
 
+	// DataDeletionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-datasource.html#cfn-bedrock-datasource-datadeletionpolicy
+	DataDeletionPolicy *string `json:"DataDeletionPolicy,omitempty"`
+
 	// DataSourceConfiguration AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-datasource.html#cfn-bedrock-datasource-datasourceconfiguration
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_bedrockfoundationmodelconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_bedrockfoundationmodelconfiguration.go
new file mode 100644
index 0000000000..944dd681ef
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_bedrockfoundationmodelconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_BedrockFoundationModelConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockfoundationmodelconfiguration.html
+type DataSource_BedrockFoundationModelConfiguration struct {
+
+	// ModelArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockfoundationmodelconfiguration.html#cfn-bedrock-datasource-bedrockfoundationmodelconfiguration-modelarn
+	ModelArn string `json:"ModelArn"`
+
+	// ParsingPrompt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-bedrockfoundationmodelconfiguration.html#cfn-bedrock-datasource-bedrockfoundationmodelconfiguration-parsingprompt
+	ParsingPrompt *DataSource_ParsingPrompt `json:"ParsingPrompt,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 *DataSource_BedrockFoundationModelConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_chunkingconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_chunkingconfiguration.go
index 1840148609..bf9b40936c 100644
--- a/cloudformation/bedrock/aws-bedrock-datasource_chunkingconfiguration.go
+++ b/cloudformation/bedrock/aws-bedrock-datasource_chunkingconfiguration.go
@@ -20,6 +20,16 @@ type DataSource_ChunkingConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-chunkingconfiguration.html#cfn-bedrock-datasource-chunkingconfiguration-fixedsizechunkingconfiguration
 	FixedSizeChunkingConfiguration *DataSource_FixedSizeChunkingConfiguration `json:"FixedSizeChunkingConfiguration,omitempty"`
 
+	// HierarchicalChunkingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-chunkingconfiguration.html#cfn-bedrock-datasource-chunkingconfiguration-hierarchicalchunkingconfiguration
+	HierarchicalChunkingConfiguration *DataSource_HierarchicalChunkingConfiguration `json:"HierarchicalChunkingConfiguration,omitempty"`
+
+	// SemanticChunkingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-chunkingconfiguration.html#cfn-bedrock-datasource-chunkingconfiguration-semanticchunkingconfiguration
+	SemanticChunkingConfiguration *DataSource_SemanticChunkingConfiguration `json:"SemanticChunkingConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_confluencecrawlerconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_confluencecrawlerconfiguration.go
new file mode 100644
index 0000000000..a72c0d323e
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_confluencecrawlerconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_ConfluenceCrawlerConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencecrawlerconfiguration.html
+type DataSource_ConfluenceCrawlerConfiguration struct {
+
+	// FilterConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencecrawlerconfiguration.html#cfn-bedrock-datasource-confluencecrawlerconfiguration-filterconfiguration
+	FilterConfiguration *DataSource_CrawlFilterConfiguration `json:"FilterConfiguration,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 *DataSource_ConfluenceCrawlerConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_confluencedatasourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_confluencedatasourceconfiguration.go
new file mode 100644
index 0000000000..e1c622116a
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_confluencedatasourceconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_ConfluenceDataSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencedatasourceconfiguration.html
+type DataSource_ConfluenceDataSourceConfiguration struct {
+
+	// CrawlerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencedatasourceconfiguration.html#cfn-bedrock-datasource-confluencedatasourceconfiguration-crawlerconfiguration
+	CrawlerConfiguration *DataSource_ConfluenceCrawlerConfiguration `json:"CrawlerConfiguration,omitempty"`
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencedatasourceconfiguration.html#cfn-bedrock-datasource-confluencedatasourceconfiguration-sourceconfiguration
+	SourceConfiguration *DataSource_ConfluenceSourceConfiguration `json:"SourceConfiguration"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_ConfluenceDataSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_confluencesourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_confluencesourceconfiguration.go
new file mode 100644
index 0000000000..6b249f813f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_confluencesourceconfiguration.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_ConfluenceSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.ConfluenceSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencesourceconfiguration.html
+type DataSource_ConfluenceSourceConfiguration struct {
+
+	// AuthType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencesourceconfiguration.html#cfn-bedrock-datasource-confluencesourceconfiguration-authtype
+	AuthType string `json:"AuthType"`
+
+	// CredentialsSecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencesourceconfiguration.html#cfn-bedrock-datasource-confluencesourceconfiguration-credentialssecretarn
+	CredentialsSecretArn string `json:"CredentialsSecretArn"`
+
+	// HostType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencesourceconfiguration.html#cfn-bedrock-datasource-confluencesourceconfiguration-hosttype
+	HostType string `json:"HostType"`
+
+	// HostUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-confluencesourceconfiguration.html#cfn-bedrock-datasource-confluencesourceconfiguration-hosturl
+	HostUrl string `json:"HostUrl"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_ConfluenceSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.ConfluenceSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_crawlfilterconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_crawlfilterconfiguration.go
new file mode 100644
index 0000000000..6623b7e053
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_crawlfilterconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_CrawlFilterConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.CrawlFilterConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-crawlfilterconfiguration.html
+type DataSource_CrawlFilterConfiguration struct {
+
+	// PatternObjectFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-crawlfilterconfiguration.html#cfn-bedrock-datasource-crawlfilterconfiguration-patternobjectfilter
+	PatternObjectFilter *DataSource_PatternObjectFilterConfiguration `json:"PatternObjectFilter,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-crawlfilterconfiguration.html#cfn-bedrock-datasource-crawlfilterconfiguration-type
+	Type string `json:"Type"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_CrawlFilterConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_customtransformationconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_customtransformationconfiguration.go
new file mode 100644
index 0000000000..528a886816
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_customtransformationconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_CustomTransformationConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.CustomTransformationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-customtransformationconfiguration.html
+type DataSource_CustomTransformationConfiguration struct {
+
+	// IntermediateStorage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-customtransformationconfiguration.html#cfn-bedrock-datasource-customtransformationconfiguration-intermediatestorage
+	IntermediateStorage *DataSource_IntermediateStorage `json:"IntermediateStorage"`
+
+	// Transformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-customtransformationconfiguration.html#cfn-bedrock-datasource-customtransformationconfiguration-transformations
+	Transformations []DataSource_Transformation `json:"Transformations"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_CustomTransformationConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.CustomTransformationConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_datasourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_datasourceconfiguration.go
index 69ac8c4b7e..70fe24a6cf 100644
--- a/cloudformation/bedrock/aws-bedrock-datasource_datasourceconfiguration.go
+++ b/cloudformation/bedrock/aws-bedrock-datasource_datasourceconfiguration.go
@@ -10,16 +10,36 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-datasourceconfiguration.html
 type DataSource_DataSourceConfiguration struct {
 
+	// ConfluenceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-datasourceconfiguration.html#cfn-bedrock-datasource-datasourceconfiguration-confluenceconfiguration
+	ConfluenceConfiguration *DataSource_ConfluenceDataSourceConfiguration `json:"ConfluenceConfiguration,omitempty"`
+
 	// S3Configuration AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-datasourceconfiguration.html#cfn-bedrock-datasource-datasourceconfiguration-s3configuration
-	S3Configuration *DataSource_S3DataSourceConfiguration `json:"S3Configuration"`
+	S3Configuration *DataSource_S3DataSourceConfiguration `json:"S3Configuration,omitempty"`
+
+	// SalesforceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-datasourceconfiguration.html#cfn-bedrock-datasource-datasourceconfiguration-salesforceconfiguration
+	SalesforceConfiguration *DataSource_SalesforceDataSourceConfiguration `json:"SalesforceConfiguration,omitempty"`
+
+	// SharePointConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-datasourceconfiguration.html#cfn-bedrock-datasource-datasourceconfiguration-sharepointconfiguration
+	SharePointConfiguration *DataSource_SharePointDataSourceConfiguration `json:"SharePointConfiguration,omitempty"`
 
 	// Type AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-datasourceconfiguration.html#cfn-bedrock-datasource-datasourceconfiguration-type
 	Type string `json:"Type"`
 
+	// WebConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-datasourceconfiguration.html#cfn-bedrock-datasource-datasourceconfiguration-webconfiguration
+	WebConfiguration *DataSource_WebDataSourceConfiguration `json:"WebConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkingconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkingconfiguration.go
new file mode 100644
index 0000000000..7a5a1c8091
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkingconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_HierarchicalChunkingConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-hierarchicalchunkingconfiguration.html
+type DataSource_HierarchicalChunkingConfiguration struct {
+
+	// LevelConfigurations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-hierarchicalchunkingconfiguration.html#cfn-bedrock-datasource-hierarchicalchunkingconfiguration-levelconfigurations
+	LevelConfigurations []DataSource_HierarchicalChunkingLevelConfiguration `json:"LevelConfigurations"`
+
+	// OverlapTokens AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-hierarchicalchunkingconfiguration.html#cfn-bedrock-datasource-hierarchicalchunkingconfiguration-overlaptokens
+	OverlapTokens int `json:"OverlapTokens"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_HierarchicalChunkingConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkinglevelconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkinglevelconfiguration.go
new file mode 100644
index 0000000000..fd458226a8
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_hierarchicalchunkinglevelconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_HierarchicalChunkingLevelConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-hierarchicalchunkinglevelconfiguration.html
+type DataSource_HierarchicalChunkingLevelConfiguration struct {
+
+	// MaxTokens AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-hierarchicalchunkinglevelconfiguration.html#cfn-bedrock-datasource-hierarchicalchunkinglevelconfiguration-maxtokens
+	MaxTokens int `json:"MaxTokens"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_HierarchicalChunkingLevelConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_intermediatestorage.go b/cloudformation/bedrock/aws-bedrock-datasource_intermediatestorage.go
new file mode 100644
index 0000000000..444f0b06fc
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_intermediatestorage.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_IntermediateStorage AWS CloudFormation Resource (AWS::Bedrock::DataSource.IntermediateStorage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-intermediatestorage.html
+type DataSource_IntermediateStorage struct {
+
+	// S3Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-intermediatestorage.html#cfn-bedrock-datasource-intermediatestorage-s3location
+	S3Location *DataSource_S3Location `json:"S3Location"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_IntermediateStorage) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.IntermediateStorage"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_parsingconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_parsingconfiguration.go
new file mode 100644
index 0000000000..919731cb17
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_parsingconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_ParsingConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.ParsingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingconfiguration.html
+type DataSource_ParsingConfiguration struct {
+
+	// BedrockFoundationModelConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingconfiguration.html#cfn-bedrock-datasource-parsingconfiguration-bedrockfoundationmodelconfiguration
+	BedrockFoundationModelConfiguration *DataSource_BedrockFoundationModelConfiguration `json:"BedrockFoundationModelConfiguration,omitempty"`
+
+	// ParsingStrategy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingconfiguration.html#cfn-bedrock-datasource-parsingconfiguration-parsingstrategy
+	ParsingStrategy string `json:"ParsingStrategy"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_ParsingConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.ParsingConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_parsingprompt.go b/cloudformation/bedrock/aws-bedrock-datasource_parsingprompt.go
new file mode 100644
index 0000000000..005655ff13
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_parsingprompt.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_ParsingPrompt AWS CloudFormation Resource (AWS::Bedrock::DataSource.ParsingPrompt)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingprompt.html
+type DataSource_ParsingPrompt struct {
+
+	// ParsingPromptText AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-parsingprompt.html#cfn-bedrock-datasource-parsingprompt-parsingprompttext
+	ParsingPromptText string `json:"ParsingPromptText"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_ParsingPrompt) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.ParsingPrompt"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilter.go b/cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilter.go
new file mode 100644
index 0000000000..6caaaa6cfd
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilter.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_PatternObjectFilter AWS CloudFormation Resource (AWS::Bedrock::DataSource.PatternObjectFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-patternobjectfilter.html
+type DataSource_PatternObjectFilter struct {
+
+	// ExclusionFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-patternobjectfilter.html#cfn-bedrock-datasource-patternobjectfilter-exclusionfilters
+	ExclusionFilters []string `json:"ExclusionFilters,omitempty"`
+
+	// InclusionFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-patternobjectfilter.html#cfn-bedrock-datasource-patternobjectfilter-inclusionfilters
+	InclusionFilters []string `json:"InclusionFilters,omitempty"`
+
+	// ObjectType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-patternobjectfilter.html#cfn-bedrock-datasource-patternobjectfilter-objecttype
+	ObjectType string `json:"ObjectType"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_PatternObjectFilter) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.PatternObjectFilter"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilterconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilterconfiguration.go
new file mode 100644
index 0000000000..3633e6f6b2
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_patternobjectfilterconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_PatternObjectFilterConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.PatternObjectFilterConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-patternobjectfilterconfiguration.html
+type DataSource_PatternObjectFilterConfiguration struct {
+
+	// Filters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-patternobjectfilterconfiguration.html#cfn-bedrock-datasource-patternobjectfilterconfiguration-filters
+	Filters []DataSource_PatternObjectFilter `json:"Filters"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_PatternObjectFilterConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.PatternObjectFilterConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_s3datasourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_s3datasourceconfiguration.go
index 3778747e8d..ff834b94b9 100644
--- a/cloudformation/bedrock/aws-bedrock-datasource_s3datasourceconfiguration.go
+++ b/cloudformation/bedrock/aws-bedrock-datasource_s3datasourceconfiguration.go
@@ -15,6 +15,11 @@ type DataSource_S3DataSourceConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3datasourceconfiguration.html#cfn-bedrock-datasource-s3datasourceconfiguration-bucketarn
 	BucketArn string `json:"BucketArn"`
 
+	// BucketOwnerAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3datasourceconfiguration.html#cfn-bedrock-datasource-s3datasourceconfiguration-bucketowneraccountid
+	BucketOwnerAccountId *string `json:"BucketOwnerAccountId,omitempty"`
+
 	// InclusionPrefixes AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3datasourceconfiguration.html#cfn-bedrock-datasource-s3datasourceconfiguration-inclusionprefixes
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_s3location.go b/cloudformation/bedrock/aws-bedrock-datasource_s3location.go
new file mode 100644
index 0000000000..71fd23027f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_s3location.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_S3Location AWS CloudFormation Resource (AWS::Bedrock::DataSource.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3location.html
+type DataSource_S3Location struct {
+
+	// URI AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-s3location.html#cfn-bedrock-datasource-s3location-uri
+	URI string `json:"URI"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_S3Location) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.S3Location"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_salesforcecrawlerconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_salesforcecrawlerconfiguration.go
new file mode 100644
index 0000000000..8eaf96aa1a
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_salesforcecrawlerconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SalesforceCrawlerConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcecrawlerconfiguration.html
+type DataSource_SalesforceCrawlerConfiguration struct {
+
+	// FilterConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcecrawlerconfiguration.html#cfn-bedrock-datasource-salesforcecrawlerconfiguration-filterconfiguration
+	FilterConfiguration *DataSource_CrawlFilterConfiguration `json:"FilterConfiguration,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 *DataSource_SalesforceCrawlerConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_salesforcedatasourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_salesforcedatasourceconfiguration.go
new file mode 100644
index 0000000000..1ede9ce06a
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_salesforcedatasourceconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SalesforceDataSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcedatasourceconfiguration.html
+type DataSource_SalesforceDataSourceConfiguration struct {
+
+	// CrawlerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcedatasourceconfiguration.html#cfn-bedrock-datasource-salesforcedatasourceconfiguration-crawlerconfiguration
+	CrawlerConfiguration *DataSource_SalesforceCrawlerConfiguration `json:"CrawlerConfiguration,omitempty"`
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcedatasourceconfiguration.html#cfn-bedrock-datasource-salesforcedatasourceconfiguration-sourceconfiguration
+	SourceConfiguration *DataSource_SalesforceSourceConfiguration `json:"SourceConfiguration"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_SalesforceDataSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_salesforcesourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_salesforcesourceconfiguration.go
new file mode 100644
index 0000000000..4e09cc390d
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_salesforcesourceconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SalesforceSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.SalesforceSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcesourceconfiguration.html
+type DataSource_SalesforceSourceConfiguration struct {
+
+	// AuthType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcesourceconfiguration.html#cfn-bedrock-datasource-salesforcesourceconfiguration-authtype
+	AuthType string `json:"AuthType"`
+
+	// CredentialsSecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcesourceconfiguration.html#cfn-bedrock-datasource-salesforcesourceconfiguration-credentialssecretarn
+	CredentialsSecretArn string `json:"CredentialsSecretArn"`
+
+	// HostUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-salesforcesourceconfiguration.html#cfn-bedrock-datasource-salesforcesourceconfiguration-hosturl
+	HostUrl string `json:"HostUrl"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_SalesforceSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SalesforceSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_seedurl.go b/cloudformation/bedrock/aws-bedrock-datasource_seedurl.go
new file mode 100644
index 0000000000..6bee7cc3b8
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_seedurl.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SeedUrl AWS CloudFormation Resource (AWS::Bedrock::DataSource.SeedUrl)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-seedurl.html
+type DataSource_SeedUrl struct {
+
+	// Url AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-seedurl.html#cfn-bedrock-datasource-seedurl-url
+	Url string `json:"Url"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_SeedUrl) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SeedUrl"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_semanticchunkingconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_semanticchunkingconfiguration.go
new file mode 100644
index 0000000000..fe9ca4dcfe
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_semanticchunkingconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SemanticChunkingConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.SemanticChunkingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-semanticchunkingconfiguration.html
+type DataSource_SemanticChunkingConfiguration struct {
+
+	// BreakpointPercentileThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-semanticchunkingconfiguration.html#cfn-bedrock-datasource-semanticchunkingconfiguration-breakpointpercentilethreshold
+	BreakpointPercentileThreshold int `json:"BreakpointPercentileThreshold"`
+
+	// BufferSize AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-semanticchunkingconfiguration.html#cfn-bedrock-datasource-semanticchunkingconfiguration-buffersize
+	BufferSize int `json:"BufferSize"`
+
+	// MaxTokens AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-semanticchunkingconfiguration.html#cfn-bedrock-datasource-semanticchunkingconfiguration-maxtokens
+	MaxTokens int `json:"MaxTokens"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_SemanticChunkingConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SemanticChunkingConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_sharepointcrawlerconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_sharepointcrawlerconfiguration.go
new file mode 100644
index 0000000000..f55bdecba5
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_sharepointcrawlerconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SharePointCrawlerConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.SharePointCrawlerConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointcrawlerconfiguration.html
+type DataSource_SharePointCrawlerConfiguration struct {
+
+	// FilterConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointcrawlerconfiguration.html#cfn-bedrock-datasource-sharepointcrawlerconfiguration-filterconfiguration
+	FilterConfiguration *DataSource_CrawlFilterConfiguration `json:"FilterConfiguration,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 *DataSource_SharePointCrawlerConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SharePointCrawlerConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_sharepointdatasourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_sharepointdatasourceconfiguration.go
new file mode 100644
index 0000000000..4ea8971f07
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_sharepointdatasourceconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SharePointDataSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.SharePointDataSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointdatasourceconfiguration.html
+type DataSource_SharePointDataSourceConfiguration struct {
+
+	// CrawlerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointdatasourceconfiguration.html#cfn-bedrock-datasource-sharepointdatasourceconfiguration-crawlerconfiguration
+	CrawlerConfiguration *DataSource_SharePointCrawlerConfiguration `json:"CrawlerConfiguration,omitempty"`
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointdatasourceconfiguration.html#cfn-bedrock-datasource-sharepointdatasourceconfiguration-sourceconfiguration
+	SourceConfiguration *DataSource_SharePointSourceConfiguration `json:"SourceConfiguration"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_SharePointDataSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SharePointDataSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_sharepointsourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_sharepointsourceconfiguration.go
new file mode 100644
index 0000000000..876a5a3f93
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_sharepointsourceconfiguration.go
@@ -0,0 +1,62 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_SharePointSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.SharePointSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointsourceconfiguration.html
+type DataSource_SharePointSourceConfiguration struct {
+
+	// AuthType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointsourceconfiguration.html#cfn-bedrock-datasource-sharepointsourceconfiguration-authtype
+	AuthType string `json:"AuthType"`
+
+	// CredentialsSecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointsourceconfiguration.html#cfn-bedrock-datasource-sharepointsourceconfiguration-credentialssecretarn
+	CredentialsSecretArn string `json:"CredentialsSecretArn"`
+
+	// Domain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointsourceconfiguration.html#cfn-bedrock-datasource-sharepointsourceconfiguration-domain
+	Domain string `json:"Domain"`
+
+	// HostType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointsourceconfiguration.html#cfn-bedrock-datasource-sharepointsourceconfiguration-hosttype
+	HostType string `json:"HostType"`
+
+	// SiteUrls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointsourceconfiguration.html#cfn-bedrock-datasource-sharepointsourceconfiguration-siteurls
+	SiteUrls []string `json:"SiteUrls"`
+
+	// TenantId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-sharepointsourceconfiguration.html#cfn-bedrock-datasource-sharepointsourceconfiguration-tenantid
+	TenantId *string `json:"TenantId,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 *DataSource_SharePointSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.SharePointSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_transformation.go b/cloudformation/bedrock/aws-bedrock-datasource_transformation.go
new file mode 100644
index 0000000000..d7699085f9
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_transformation.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_Transformation AWS CloudFormation Resource (AWS::Bedrock::DataSource.Transformation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-transformation.html
+type DataSource_Transformation struct {
+
+	// StepToApply AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-transformation.html#cfn-bedrock-datasource-transformation-steptoapply
+	StepToApply string `json:"StepToApply"`
+
+	// TransformationFunction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-transformation.html#cfn-bedrock-datasource-transformation-transformationfunction
+	TransformationFunction *DataSource_TransformationFunction `json:"TransformationFunction"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_Transformation) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.Transformation"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_transformationfunction.go b/cloudformation/bedrock/aws-bedrock-datasource_transformationfunction.go
new file mode 100644
index 0000000000..d7ec6ba254
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_transformationfunction.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_TransformationFunction AWS CloudFormation Resource (AWS::Bedrock::DataSource.TransformationFunction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-transformationfunction.html
+type DataSource_TransformationFunction struct {
+
+	// TransformationLambdaConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-transformationfunction.html#cfn-bedrock-datasource-transformationfunction-transformationlambdaconfiguration
+	TransformationLambdaConfiguration *DataSource_TransformationLambdaConfiguration `json:"TransformationLambdaConfiguration"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_TransformationFunction) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.TransformationFunction"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_transformationlambdaconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_transformationlambdaconfiguration.go
new file mode 100644
index 0000000000..0e71a6d9a4
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_transformationlambdaconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_TransformationLambdaConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.TransformationLambdaConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-transformationlambdaconfiguration.html
+type DataSource_TransformationLambdaConfiguration struct {
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-transformationlambdaconfiguration.html#cfn-bedrock-datasource-transformationlambdaconfiguration-lambdaarn
+	LambdaArn string `json:"LambdaArn"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_TransformationLambdaConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.TransformationLambdaConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_urlconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_urlconfiguration.go
new file mode 100644
index 0000000000..b135ba5f93
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_urlconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_UrlConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.UrlConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-urlconfiguration.html
+type DataSource_UrlConfiguration struct {
+
+	// SeedUrls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-urlconfiguration.html#cfn-bedrock-datasource-urlconfiguration-seedurls
+	SeedUrls []DataSource_SeedUrl `json:"SeedUrls"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_UrlConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.UrlConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_vectoringestionconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_vectoringestionconfiguration.go
index b55bfd1547..a3020db5a6 100644
--- a/cloudformation/bedrock/aws-bedrock-datasource_vectoringestionconfiguration.go
+++ b/cloudformation/bedrock/aws-bedrock-datasource_vectoringestionconfiguration.go
@@ -15,6 +15,16 @@ type DataSource_VectorIngestionConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-vectoringestionconfiguration.html#cfn-bedrock-datasource-vectoringestionconfiguration-chunkingconfiguration
 	ChunkingConfiguration *DataSource_ChunkingConfiguration `json:"ChunkingConfiguration,omitempty"`
 
+	// CustomTransformationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-vectoringestionconfiguration.html#cfn-bedrock-datasource-vectoringestionconfiguration-customtransformationconfiguration
+	CustomTransformationConfiguration *DataSource_CustomTransformationConfiguration `json:"CustomTransformationConfiguration,omitempty"`
+
+	// ParsingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-vectoringestionconfiguration.html#cfn-bedrock-datasource-vectoringestionconfiguration-parsingconfiguration
+	ParsingConfiguration *DataSource_ParsingConfiguration `json:"ParsingConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_webcrawlerconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_webcrawlerconfiguration.go
new file mode 100644
index 0000000000..391a280516
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_webcrawlerconfiguration.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.WebCrawlerConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webcrawlerconfiguration.html
+type DataSource_WebCrawlerConfiguration struct {
+
+	// CrawlerLimits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webcrawlerconfiguration.html#cfn-bedrock-datasource-webcrawlerconfiguration-crawlerlimits
+	CrawlerLimits *DataSource_WebCrawlerLimits `json:"CrawlerLimits,omitempty"`
+
+	// ExclusionFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webcrawlerconfiguration.html#cfn-bedrock-datasource-webcrawlerconfiguration-exclusionfilters
+	ExclusionFilters []string `json:"ExclusionFilters,omitempty"`
+
+	// InclusionFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webcrawlerconfiguration.html#cfn-bedrock-datasource-webcrawlerconfiguration-inclusionfilters
+	InclusionFilters []string `json:"InclusionFilters,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webcrawlerconfiguration.html#cfn-bedrock-datasource-webcrawlerconfiguration-scope
+	Scope *string `json:"Scope,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 *DataSource_WebCrawlerConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.WebCrawlerConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_webcrawlerlimits.go b/cloudformation/bedrock/aws-bedrock-datasource_webcrawlerlimits.go
new file mode 100644
index 0000000000..db3007a247
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_webcrawlerlimits.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerLimits AWS CloudFormation Resource (AWS::Bedrock::DataSource.WebCrawlerLimits)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webcrawlerlimits.html
+type DataSource_WebCrawlerLimits struct {
+
+	// RateLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webcrawlerlimits.html#cfn-bedrock-datasource-webcrawlerlimits-ratelimit
+	RateLimit *int `json:"RateLimit,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 *DataSource_WebCrawlerLimits) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.WebCrawlerLimits"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_webdatasourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_webdatasourceconfiguration.go
new file mode 100644
index 0000000000..6673433a36
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_webdatasourceconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_WebDataSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.WebDataSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webdatasourceconfiguration.html
+type DataSource_WebDataSourceConfiguration struct {
+
+	// CrawlerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webdatasourceconfiguration.html#cfn-bedrock-datasource-webdatasourceconfiguration-crawlerconfiguration
+	CrawlerConfiguration *DataSource_WebCrawlerConfiguration `json:"CrawlerConfiguration,omitempty"`
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-webdatasourceconfiguration.html#cfn-bedrock-datasource-webdatasourceconfiguration-sourceconfiguration
+	SourceConfiguration *DataSource_WebSourceConfiguration `json:"SourceConfiguration"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_WebDataSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.WebDataSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-datasource_websourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-datasource_websourceconfiguration.go
new file mode 100644
index 0000000000..eb27595adc
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-datasource_websourceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_WebSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::DataSource.WebSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-websourceconfiguration.html
+type DataSource_WebSourceConfiguration struct {
+
+	// UrlConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-datasource-websourceconfiguration.html#cfn-bedrock-datasource-websourceconfiguration-urlconfiguration
+	UrlConfiguration *DataSource_UrlConfiguration `json:"UrlConfiguration"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_WebSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::DataSource.WebSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow.go b/cloudformation/bedrock/aws-bedrock-flow.go
new file mode 100644
index 0000000000..65fd1911c7
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow.go
@@ -0,0 +1,162 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow AWS CloudFormation Resource (AWS::Bedrock::Flow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html
+type Flow struct {
+
+	// CustomerEncryptionKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-customerencryptionkeyarn
+	CustomerEncryptionKeyArn *string `json:"CustomerEncryptionKeyArn,omitempty"`
+
+	// Definition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-definition
+	Definition *Flow_FlowDefinition `json:"Definition,omitempty"`
+
+	// DefinitionS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-definitions3location
+	DefinitionS3Location *Flow_S3Location `json:"DefinitionS3Location,omitempty"`
+
+	// DefinitionString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-definitionstring
+	DefinitionString *string `json:"DefinitionString,omitempty"`
+
+	// DefinitionSubstitutions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-definitionsubstitutions
+	DefinitionSubstitutions map[string]interface{} `json:"DefinitionSubstitutions,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-description
+	Description *string `json:"Description,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-executionrolearn
+	ExecutionRoleArn string `json:"ExecutionRoleArn"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-tags
+	Tags map[string]string `json:"Tags,omitempty"`
+
+	// TestAliasTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flow.html#cfn-bedrock-flow-testaliastags
+	TestAliasTags map[string]string `json:"TestAliasTags,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 *Flow) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow"
+}
+
+// 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 Flow) MarshalJSON() ([]byte, error) {
+	type Properties Flow
+	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 *Flow) UnmarshalJSON(b []byte) error {
+	type Properties Flow
+	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 = Flow(*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/bedrock/aws-bedrock-flow_agentflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_agentflownodeconfiguration.go
new file mode 100644
index 0000000000..8b01e12b4c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_agentflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_AgentFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.AgentFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-agentflownodeconfiguration.html
+type Flow_AgentFlowNodeConfiguration struct {
+
+	// AgentAliasArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-agentflownodeconfiguration.html#cfn-bedrock-flow-agentflownodeconfiguration-agentaliasarn
+	AgentAliasArn string `json:"AgentAliasArn"`
+
+	// 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 *Flow_AgentFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.AgentFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_conditionflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_conditionflownodeconfiguration.go
new file mode 100644
index 0000000000..c99e433430
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_conditionflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_ConditionFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.ConditionFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-conditionflownodeconfiguration.html
+type Flow_ConditionFlowNodeConfiguration struct {
+
+	// Conditions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-conditionflownodeconfiguration.html#cfn-bedrock-flow-conditionflownodeconfiguration-conditions
+	Conditions []Flow_FlowCondition `json:"Conditions"`
+
+	// 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 *Flow_ConditionFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.ConditionFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flowcondition.go b/cloudformation/bedrock/aws-bedrock-flow_flowcondition.go
new file mode 100644
index 0000000000..f0873d6c4a
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flowcondition.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowCondition AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowcondition.html
+type Flow_FlowCondition struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowcondition.html#cfn-bedrock-flow-flowcondition-expression
+	Expression *string `json:"Expression,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowcondition.html#cfn-bedrock-flow-flowcondition-name
+	Name string `json:"Name"`
+
+	// 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 *Flow_FlowCondition) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowCondition"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flowconditionalconnectionconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_flowconditionalconnectionconfiguration.go
new file mode 100644
index 0000000000..0335a15f67
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flowconditionalconnectionconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowConditionalConnectionConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconditionalconnectionconfiguration.html
+type Flow_FlowConditionalConnectionConfiguration struct {
+
+	// Condition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconditionalconnectionconfiguration.html#cfn-bedrock-flow-flowconditionalconnectionconfiguration-condition
+	Condition string `json:"Condition"`
+
+	// 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 *Flow_FlowConditionalConnectionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flowconnection.go b/cloudformation/bedrock/aws-bedrock-flow_flowconnection.go
new file mode 100644
index 0000000000..011a21fb9c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flowconnection.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowConnection AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowConnection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnection.html
+type Flow_FlowConnection struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnection.html#cfn-bedrock-flow-flowconnection-configuration
+	Configuration *Flow_FlowConnectionConfiguration `json:"Configuration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnection.html#cfn-bedrock-flow-flowconnection-name
+	Name string `json:"Name"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnection.html#cfn-bedrock-flow-flowconnection-source
+	Source string `json:"Source"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnection.html#cfn-bedrock-flow-flowconnection-target
+	Target string `json:"Target"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnection.html#cfn-bedrock-flow-flowconnection-type
+	Type string `json:"Type"`
+
+	// 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 *Flow_FlowConnection) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowConnection"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flowconnectionconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_flowconnectionconfiguration.go
new file mode 100644
index 0000000000..6d4ec3bcd0
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flowconnectionconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowConnectionConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowConnectionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnectionconfiguration.html
+type Flow_FlowConnectionConfiguration struct {
+
+	// Conditional AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnectionconfiguration.html#cfn-bedrock-flow-flowconnectionconfiguration-conditional
+	Conditional *Flow_FlowConditionalConnectionConfiguration `json:"Conditional,omitempty"`
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowconnectionconfiguration.html#cfn-bedrock-flow-flowconnectionconfiguration-data
+	Data *Flow_FlowDataConnectionConfiguration `json:"Data,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 *Flow_FlowConnectionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowConnectionConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flowdataconnectionconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_flowdataconnectionconfiguration.go
new file mode 100644
index 0000000000..e033ec01b1
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flowdataconnectionconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowDataConnectionConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowDataConnectionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowdataconnectionconfiguration.html
+type Flow_FlowDataConnectionConfiguration struct {
+
+	// SourceOutput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowdataconnectionconfiguration.html#cfn-bedrock-flow-flowdataconnectionconfiguration-sourceoutput
+	SourceOutput string `json:"SourceOutput"`
+
+	// TargetInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowdataconnectionconfiguration.html#cfn-bedrock-flow-flowdataconnectionconfiguration-targetinput
+	TargetInput string `json:"TargetInput"`
+
+	// 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 *Flow_FlowDataConnectionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowDataConnectionConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flowdefinition.go b/cloudformation/bedrock/aws-bedrock-flow_flowdefinition.go
new file mode 100644
index 0000000000..fc027cbc46
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flowdefinition.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowDefinition AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowdefinition.html
+type Flow_FlowDefinition struct {
+
+	// Connections AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowdefinition.html#cfn-bedrock-flow-flowdefinition-connections
+	Connections []Flow_FlowConnection `json:"Connections,omitempty"`
+
+	// Nodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowdefinition.html#cfn-bedrock-flow-flowdefinition-nodes
+	Nodes []Flow_FlowNode `json:"Nodes,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 *Flow_FlowDefinition) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowDefinition"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flownode.go b/cloudformation/bedrock/aws-bedrock-flow_flownode.go
new file mode 100644
index 0000000000..e3041b6852
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flownode.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowNode AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowNode)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownode.html
+type Flow_FlowNode struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownode.html#cfn-bedrock-flow-flownode-configuration
+	Configuration *Flow_FlowNodeConfiguration `json:"Configuration,omitempty"`
+
+	// Inputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownode.html#cfn-bedrock-flow-flownode-inputs
+	Inputs []Flow_FlowNodeInput `json:"Inputs,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownode.html#cfn-bedrock-flow-flownode-name
+	Name string `json:"Name"`
+
+	// Outputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownode.html#cfn-bedrock-flow-flownode-outputs
+	Outputs []Flow_FlowNodeOutput `json:"Outputs,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownode.html#cfn-bedrock-flow-flownode-type
+	Type string `json:"Type"`
+
+	// 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 *Flow_FlowNode) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowNode"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_flownodeconfiguration.go
new file mode 100644
index 0000000000..af58d19e6c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flownodeconfiguration.go
@@ -0,0 +1,92 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html
+type Flow_FlowNodeConfiguration struct {
+
+	// Agent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-agent
+	Agent *Flow_AgentFlowNodeConfiguration `json:"Agent,omitempty"`
+
+	// Collector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-collector
+	Collector interface{} `json:"Collector,omitempty"`
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-condition
+	Condition *Flow_ConditionFlowNodeConfiguration `json:"Condition,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-input
+	Input interface{} `json:"Input,omitempty"`
+
+	// Iterator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-iterator
+	Iterator interface{} `json:"Iterator,omitempty"`
+
+	// KnowledgeBase AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-knowledgebase
+	KnowledgeBase *Flow_KnowledgeBaseFlowNodeConfiguration `json:"KnowledgeBase,omitempty"`
+
+	// LambdaFunction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-lambdafunction
+	LambdaFunction *Flow_LambdaFunctionFlowNodeConfiguration `json:"LambdaFunction,omitempty"`
+
+	// Lex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-lex
+	Lex *Flow_LexFlowNodeConfiguration `json:"Lex,omitempty"`
+
+	// Output AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-output
+	Output interface{} `json:"Output,omitempty"`
+
+	// Prompt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-prompt
+	Prompt *Flow_PromptFlowNodeConfiguration `json:"Prompt,omitempty"`
+
+	// Retrieval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-retrieval
+	Retrieval *Flow_RetrievalFlowNodeConfiguration `json:"Retrieval,omitempty"`
+
+	// Storage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeconfiguration.html#cfn-bedrock-flow-flownodeconfiguration-storage
+	Storage *Flow_StorageFlowNodeConfiguration `json:"Storage,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 *Flow_FlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flownodeinput.go b/cloudformation/bedrock/aws-bedrock-flow_flownodeinput.go
new file mode 100644
index 0000000000..0c6a58bc47
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flownodeinput.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowNodeInput AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowNodeInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeinput.html
+type Flow_FlowNodeInput struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeinput.html#cfn-bedrock-flow-flownodeinput-expression
+	Expression string `json:"Expression"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeinput.html#cfn-bedrock-flow-flownodeinput-name
+	Name string `json:"Name"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeinput.html#cfn-bedrock-flow-flownodeinput-type
+	Type string `json:"Type"`
+
+	// 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 *Flow_FlowNodeInput) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowNodeInput"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flownodeoutput.go b/cloudformation/bedrock/aws-bedrock-flow_flownodeoutput.go
new file mode 100644
index 0000000000..d55c0d68f2
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flownodeoutput.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowNodeOutput AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowNodeOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeoutput.html
+type Flow_FlowNodeOutput struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeoutput.html#cfn-bedrock-flow-flownodeoutput-name
+	Name string `json:"Name"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flownodeoutput.html#cfn-bedrock-flow-flownodeoutput-type
+	Type string `json:"Type"`
+
+	// 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 *Flow_FlowNodeOutput) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowNodeOutput"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_flowvalidation.go b/cloudformation/bedrock/aws-bedrock-flow_flowvalidation.go
new file mode 100644
index 0000000000..5d74d27d48
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_flowvalidation.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_FlowValidation AWS CloudFormation Resource (AWS::Bedrock::Flow.FlowValidation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowvalidation.html
+type Flow_FlowValidation struct {
+
+	// Message AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-flowvalidation.html#cfn-bedrock-flow-flowvalidation-message
+	Message string `json:"Message"`
+
+	// 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 *Flow_FlowValidation) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.FlowValidation"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_knowledgebaseflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_knowledgebaseflownodeconfiguration.go
new file mode 100644
index 0000000000..656e2790a8
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_knowledgebaseflownodeconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_KnowledgeBaseFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-knowledgebaseflownodeconfiguration.html
+type Flow_KnowledgeBaseFlowNodeConfiguration struct {
+
+	// KnowledgeBaseId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-knowledgebaseflownodeconfiguration.html#cfn-bedrock-flow-knowledgebaseflownodeconfiguration-knowledgebaseid
+	KnowledgeBaseId string `json:"KnowledgeBaseId"`
+
+	// ModelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-knowledgebaseflownodeconfiguration.html#cfn-bedrock-flow-knowledgebaseflownodeconfiguration-modelid
+	ModelId *string `json:"ModelId,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 *Flow_KnowledgeBaseFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_lambdafunctionflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_lambdafunctionflownodeconfiguration.go
new file mode 100644
index 0000000000..25404d690f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_lambdafunctionflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_LambdaFunctionFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-lambdafunctionflownodeconfiguration.html
+type Flow_LambdaFunctionFlowNodeConfiguration struct {
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-lambdafunctionflownodeconfiguration.html#cfn-bedrock-flow-lambdafunctionflownodeconfiguration-lambdaarn
+	LambdaArn string `json:"LambdaArn"`
+
+	// 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 *Flow_LambdaFunctionFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_lexflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_lexflownodeconfiguration.go
new file mode 100644
index 0000000000..018f2e8d9c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_lexflownodeconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_LexFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.LexFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-lexflownodeconfiguration.html
+type Flow_LexFlowNodeConfiguration struct {
+
+	// BotAliasArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-lexflownodeconfiguration.html#cfn-bedrock-flow-lexflownodeconfiguration-botaliasarn
+	BotAliasArn string `json:"BotAliasArn"`
+
+	// LocaleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-lexflownodeconfiguration.html#cfn-bedrock-flow-lexflownodeconfiguration-localeid
+	LocaleId string `json:"LocaleId"`
+
+	// 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 *Flow_LexFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.LexFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_promptflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_promptflownodeconfiguration.go
new file mode 100644
index 0000000000..1cc5ae77eb
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_promptflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodeconfiguration.html
+type Flow_PromptFlowNodeConfiguration struct {
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodeconfiguration.html#cfn-bedrock-flow-promptflownodeconfiguration-sourceconfiguration
+	SourceConfiguration *Flow_PromptFlowNodeSourceConfiguration `json:"SourceConfiguration"`
+
+	// 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 *Flow_PromptFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_promptflownodeinlineconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_promptflownodeinlineconfiguration.go
new file mode 100644
index 0000000000..489d7c9087
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_promptflownodeinlineconfiguration.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptFlowNodeInlineConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodeinlineconfiguration.html
+type Flow_PromptFlowNodeInlineConfiguration struct {
+
+	// InferenceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodeinlineconfiguration.html#cfn-bedrock-flow-promptflownodeinlineconfiguration-inferenceconfiguration
+	InferenceConfiguration *Flow_PromptInferenceConfiguration `json:"InferenceConfiguration,omitempty"`
+
+	// ModelId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodeinlineconfiguration.html#cfn-bedrock-flow-promptflownodeinlineconfiguration-modelid
+	ModelId string `json:"ModelId"`
+
+	// TemplateConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodeinlineconfiguration.html#cfn-bedrock-flow-promptflownodeinlineconfiguration-templateconfiguration
+	TemplateConfiguration *Flow_PromptTemplateConfiguration `json:"TemplateConfiguration"`
+
+	// TemplateType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodeinlineconfiguration.html#cfn-bedrock-flow-promptflownodeinlineconfiguration-templatetype
+	TemplateType string `json:"TemplateType"`
+
+	// 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 *Flow_PromptFlowNodeInlineConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_promptflownoderesourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_promptflownoderesourceconfiguration.go
new file mode 100644
index 0000000000..73d68f017f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_promptflownoderesourceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptFlowNodeResourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownoderesourceconfiguration.html
+type Flow_PromptFlowNodeResourceConfiguration struct {
+
+	// PromptArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownoderesourceconfiguration.html#cfn-bedrock-flow-promptflownoderesourceconfiguration-promptarn
+	PromptArn string `json:"PromptArn"`
+
+	// 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 *Flow_PromptFlowNodeResourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_promptflownodesourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_promptflownodesourceconfiguration.go
new file mode 100644
index 0000000000..9d2f58c827
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_promptflownodesourceconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptFlowNodeSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodesourceconfiguration.html
+type Flow_PromptFlowNodeSourceConfiguration struct {
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodesourceconfiguration.html#cfn-bedrock-flow-promptflownodesourceconfiguration-inline
+	Inline *Flow_PromptFlowNodeInlineConfiguration `json:"Inline,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptflownodesourceconfiguration.html#cfn-bedrock-flow-promptflownodesourceconfiguration-resource
+	Resource *Flow_PromptFlowNodeResourceConfiguration `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 *Flow_PromptFlowNodeSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_promptinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_promptinferenceconfiguration.go
new file mode 100644
index 0000000000..9508d11139
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_promptinferenceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptinferenceconfiguration.html
+type Flow_PromptInferenceConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptinferenceconfiguration.html#cfn-bedrock-flow-promptinferenceconfiguration-text
+	Text *Flow_PromptModelInferenceConfiguration `json:"Text"`
+
+	// 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 *Flow_PromptInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_promptinputvariable.go b/cloudformation/bedrock/aws-bedrock-flow_promptinputvariable.go
new file mode 100644
index 0000000000..f8973e4965
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_promptinputvariable.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptInputVariable AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptInputVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptinputvariable.html
+type Flow_PromptInputVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptinputvariable.html#cfn-bedrock-flow-promptinputvariable-name
+	Name *string `json:"Name,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 *Flow_PromptInputVariable) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptInputVariable"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_promptmodelinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_promptmodelinferenceconfiguration.go
new file mode 100644
index 0000000000..9790728dda
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_promptmodelinferenceconfiguration.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptModelInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptModelInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptmodelinferenceconfiguration.html
+type Flow_PromptModelInferenceConfiguration struct {
+
+	// MaxTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptmodelinferenceconfiguration.html#cfn-bedrock-flow-promptmodelinferenceconfiguration-maxtokens
+	MaxTokens *float64 `json:"MaxTokens,omitempty"`
+
+	// StopSequences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptmodelinferenceconfiguration.html#cfn-bedrock-flow-promptmodelinferenceconfiguration-stopsequences
+	StopSequences []string `json:"StopSequences,omitempty"`
+
+	// Temperature AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptmodelinferenceconfiguration.html#cfn-bedrock-flow-promptmodelinferenceconfiguration-temperature
+	Temperature *float64 `json:"Temperature,omitempty"`
+
+	// TopK AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptmodelinferenceconfiguration.html#cfn-bedrock-flow-promptmodelinferenceconfiguration-topk
+	TopK *float64 `json:"TopK,omitempty"`
+
+	// TopP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-promptmodelinferenceconfiguration.html#cfn-bedrock-flow-promptmodelinferenceconfiguration-topp
+	TopP *float64 `json:"TopP,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 *Flow_PromptModelInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptModelInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_prompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_prompttemplateconfiguration.go
new file mode 100644
index 0000000000..418439a236
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_prompttemplateconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_PromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.PromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-prompttemplateconfiguration.html
+type Flow_PromptTemplateConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-prompttemplateconfiguration.html#cfn-bedrock-flow-prompttemplateconfiguration-text
+	Text *Flow_TextPromptTemplateConfiguration `json:"Text"`
+
+	// 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 *Flow_PromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.PromptTemplateConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeconfiguration.go
new file mode 100644
index 0000000000..08baef5cd7
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_RetrievalFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-retrievalflownodeconfiguration.html
+type Flow_RetrievalFlowNodeConfiguration struct {
+
+	// ServiceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-retrievalflownodeconfiguration.html#cfn-bedrock-flow-retrievalflownodeconfiguration-serviceconfiguration
+	ServiceConfiguration *Flow_RetrievalFlowNodeServiceConfiguration `json:"ServiceConfiguration"`
+
+	// 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 *Flow_RetrievalFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodes3configuration.go b/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodes3configuration.go
new file mode 100644
index 0000000000..65318aadee
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodes3configuration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_RetrievalFlowNodeS3Configuration AWS CloudFormation Resource (AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-retrievalflownodes3configuration.html
+type Flow_RetrievalFlowNodeS3Configuration struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-retrievalflownodes3configuration.html#cfn-bedrock-flow-retrievalflownodes3configuration-bucketname
+	BucketName string `json:"BucketName"`
+
+	// 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 *Flow_RetrievalFlowNodeS3Configuration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeserviceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeserviceconfiguration.go
new file mode 100644
index 0000000000..cb2034eff5
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_retrievalflownodeserviceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_RetrievalFlowNodeServiceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-retrievalflownodeserviceconfiguration.html
+type Flow_RetrievalFlowNodeServiceConfiguration struct {
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-retrievalflownodeserviceconfiguration.html#cfn-bedrock-flow-retrievalflownodeserviceconfiguration-s3
+	S3 *Flow_RetrievalFlowNodeS3Configuration `json:"S3,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 *Flow_RetrievalFlowNodeServiceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_s3location.go b/cloudformation/bedrock/aws-bedrock-flow_s3location.go
new file mode 100644
index 0000000000..b2db05e1cb
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_s3location.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_S3Location AWS CloudFormation Resource (AWS::Bedrock::Flow.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-s3location.html
+type Flow_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-s3location.html#cfn-bedrock-flow-s3location-bucket
+	Bucket string `json:"Bucket"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-s3location.html#cfn-bedrock-flow-s3location-key
+	Key string `json:"Key"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-s3location.html#cfn-bedrock-flow-s3location-version
+	Version *string `json:"Version,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 *Flow_S3Location) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.S3Location"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_storageflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_storageflownodeconfiguration.go
new file mode 100644
index 0000000000..35fa9df58e
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_storageflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_StorageFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.StorageFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-storageflownodeconfiguration.html
+type Flow_StorageFlowNodeConfiguration struct {
+
+	// ServiceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-storageflownodeconfiguration.html#cfn-bedrock-flow-storageflownodeconfiguration-serviceconfiguration
+	ServiceConfiguration *Flow_StorageFlowNodeServiceConfiguration `json:"ServiceConfiguration"`
+
+	// 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 *Flow_StorageFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.StorageFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_storageflownodes3configuration.go b/cloudformation/bedrock/aws-bedrock-flow_storageflownodes3configuration.go
new file mode 100644
index 0000000000..1d6e94ec7e
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_storageflownodes3configuration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_StorageFlowNodeS3Configuration AWS CloudFormation Resource (AWS::Bedrock::Flow.StorageFlowNodeS3Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-storageflownodes3configuration.html
+type Flow_StorageFlowNodeS3Configuration struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-storageflownodes3configuration.html#cfn-bedrock-flow-storageflownodes3configuration-bucketname
+	BucketName string `json:"BucketName"`
+
+	// 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 *Flow_StorageFlowNodeS3Configuration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.StorageFlowNodeS3Configuration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_storageflownodeserviceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_storageflownodeserviceconfiguration.go
new file mode 100644
index 0000000000..79289f8777
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_storageflownodeserviceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_StorageFlowNodeServiceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-storageflownodeserviceconfiguration.html
+type Flow_StorageFlowNodeServiceConfiguration struct {
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-storageflownodeserviceconfiguration.html#cfn-bedrock-flow-storageflownodeserviceconfiguration-s3
+	S3 *Flow_StorageFlowNodeS3Configuration `json:"S3,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 *Flow_StorageFlowNodeServiceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flow_textprompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-flow_textprompttemplateconfiguration.go
new file mode 100644
index 0000000000..600ce86770
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flow_textprompttemplateconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_TextPromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::Flow.TextPromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-textprompttemplateconfiguration.html
+type Flow_TextPromptTemplateConfiguration struct {
+
+	// InputVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-textprompttemplateconfiguration.html#cfn-bedrock-flow-textprompttemplateconfiguration-inputvariables
+	InputVariables []Flow_PromptInputVariable `json:"InputVariables,omitempty"`
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flow-textprompttemplateconfiguration.html#cfn-bedrock-flow-textprompttemplateconfiguration-text
+	Text string `json:"Text"`
+
+	// 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 *Flow_TextPromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Flow.TextPromptTemplateConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowalias.go b/cloudformation/bedrock/aws-bedrock-flowalias.go
new file mode 100644
index 0000000000..59dba946e1
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowalias.go
@@ -0,0 +1,137 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowAlias AWS CloudFormation Resource (AWS::Bedrock::FlowAlias)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowalias.html
+type FlowAlias struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowalias.html#cfn-bedrock-flowalias-description
+	Description *string `json:"Description,omitempty"`
+
+	// FlowArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowalias.html#cfn-bedrock-flowalias-flowarn
+	FlowArn string `json:"FlowArn"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowalias.html#cfn-bedrock-flowalias-name
+	Name string `json:"Name"`
+
+	// RoutingConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowalias.html#cfn-bedrock-flowalias-routingconfiguration
+	RoutingConfiguration []FlowAlias_FlowAliasRoutingConfigurationListItem `json:"RoutingConfiguration"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowalias.html#cfn-bedrock-flowalias-tags
+	Tags map[string]string `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 *FlowAlias) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowAlias"
+}
+
+// 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 FlowAlias) MarshalJSON() ([]byte, error) {
+	type Properties FlowAlias
+	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 *FlowAlias) UnmarshalJSON(b []byte) error {
+	type Properties FlowAlias
+	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 = FlowAlias(*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/bedrock/aws-bedrock-flowalias_flowaliasroutingconfigurationlistitem.go b/cloudformation/bedrock/aws-bedrock-flowalias_flowaliasroutingconfigurationlistitem.go
new file mode 100644
index 0000000000..73a0aadef5
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowalias_flowaliasroutingconfigurationlistitem.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowAlias_FlowAliasRoutingConfigurationListItem AWS CloudFormation Resource (AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowalias-flowaliasroutingconfigurationlistitem.html
+type FlowAlias_FlowAliasRoutingConfigurationListItem struct {
+
+	// FlowVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowalias-flowaliasroutingconfigurationlistitem.html#cfn-bedrock-flowalias-flowaliasroutingconfigurationlistitem-flowversion
+	FlowVersion *string `json:"FlowVersion,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 *FlowAlias_FlowAliasRoutingConfigurationListItem) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion.go b/cloudformation/bedrock/aws-bedrock-flowversion.go
new file mode 100644
index 0000000000..b74bbe490d
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion AWS CloudFormation Resource (AWS::Bedrock::FlowVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowversion.html
+type FlowVersion struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowversion.html#cfn-bedrock-flowversion-description
+	Description *string `json:"Description,omitempty"`
+
+	// FlowArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-flowversion.html#cfn-bedrock-flowversion-flowarn
+	FlowArn string `json:"FlowArn"`
+
+	// 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 *FlowVersion) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion"
+}
+
+// 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 FlowVersion) MarshalJSON() ([]byte, error) {
+	type Properties FlowVersion
+	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 *FlowVersion) UnmarshalJSON(b []byte) error {
+	type Properties FlowVersion
+	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 = FlowVersion(*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/bedrock/aws-bedrock-flowversion_agentflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_agentflownodeconfiguration.go
new file mode 100644
index 0000000000..2cdc0667b7
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_agentflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_AgentFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-agentflownodeconfiguration.html
+type FlowVersion_AgentFlowNodeConfiguration struct {
+
+	// AgentAliasArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-agentflownodeconfiguration.html#cfn-bedrock-flowversion-agentflownodeconfiguration-agentaliasarn
+	AgentAliasArn string `json:"AgentAliasArn"`
+
+	// 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 *FlowVersion_AgentFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_conditionflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_conditionflownodeconfiguration.go
new file mode 100644
index 0000000000..aa2e2a757c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_conditionflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_ConditionFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-conditionflownodeconfiguration.html
+type FlowVersion_ConditionFlowNodeConfiguration struct {
+
+	// Conditions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-conditionflownodeconfiguration.html#cfn-bedrock-flowversion-conditionflownodeconfiguration-conditions
+	Conditions []FlowVersion_FlowCondition `json:"Conditions"`
+
+	// 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 *FlowVersion_ConditionFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flowcondition.go b/cloudformation/bedrock/aws-bedrock-flowversion_flowcondition.go
new file mode 100644
index 0000000000..2ede5f0cb9
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flowcondition.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowCondition AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowcondition.html
+type FlowVersion_FlowCondition struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowcondition.html#cfn-bedrock-flowversion-flowcondition-expression
+	Expression *string `json:"Expression,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowcondition.html#cfn-bedrock-flowversion-flowcondition-name
+	Name string `json:"Name"`
+
+	// 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 *FlowVersion_FlowCondition) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowCondition"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flowconditionalconnectionconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_flowconditionalconnectionconfiguration.go
new file mode 100644
index 0000000000..61a423eda6
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flowconditionalconnectionconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowConditionalConnectionConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconditionalconnectionconfiguration.html
+type FlowVersion_FlowConditionalConnectionConfiguration struct {
+
+	// Condition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconditionalconnectionconfiguration.html#cfn-bedrock-flowversion-flowconditionalconnectionconfiguration-condition
+	Condition string `json:"Condition"`
+
+	// 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 *FlowVersion_FlowConditionalConnectionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flowconnection.go b/cloudformation/bedrock/aws-bedrock-flowversion_flowconnection.go
new file mode 100644
index 0000000000..7488084f8a
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flowconnection.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowConnection AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowConnection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnection.html
+type FlowVersion_FlowConnection struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnection.html#cfn-bedrock-flowversion-flowconnection-configuration
+	Configuration *FlowVersion_FlowConnectionConfiguration `json:"Configuration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnection.html#cfn-bedrock-flowversion-flowconnection-name
+	Name string `json:"Name"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnection.html#cfn-bedrock-flowversion-flowconnection-source
+	Source string `json:"Source"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnection.html#cfn-bedrock-flowversion-flowconnection-target
+	Target string `json:"Target"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnection.html#cfn-bedrock-flowversion-flowconnection-type
+	Type string `json:"Type"`
+
+	// 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 *FlowVersion_FlowConnection) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowConnection"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flowconnectionconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_flowconnectionconfiguration.go
new file mode 100644
index 0000000000..8049ec46cb
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flowconnectionconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowConnectionConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowConnectionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnectionconfiguration.html
+type FlowVersion_FlowConnectionConfiguration struct {
+
+	// Conditional AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnectionconfiguration.html#cfn-bedrock-flowversion-flowconnectionconfiguration-conditional
+	Conditional *FlowVersion_FlowConditionalConnectionConfiguration `json:"Conditional,omitempty"`
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowconnectionconfiguration.html#cfn-bedrock-flowversion-flowconnectionconfiguration-data
+	Data *FlowVersion_FlowDataConnectionConfiguration `json:"Data,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 *FlowVersion_FlowConnectionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowConnectionConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flowdataconnectionconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_flowdataconnectionconfiguration.go
new file mode 100644
index 0000000000..6e319c8668
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flowdataconnectionconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowDataConnectionConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowdataconnectionconfiguration.html
+type FlowVersion_FlowDataConnectionConfiguration struct {
+
+	// SourceOutput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowdataconnectionconfiguration.html#cfn-bedrock-flowversion-flowdataconnectionconfiguration-sourceoutput
+	SourceOutput string `json:"SourceOutput"`
+
+	// TargetInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowdataconnectionconfiguration.html#cfn-bedrock-flowversion-flowdataconnectionconfiguration-targetinput
+	TargetInput string `json:"TargetInput"`
+
+	// 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 *FlowVersion_FlowDataConnectionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flowdefinition.go b/cloudformation/bedrock/aws-bedrock-flowversion_flowdefinition.go
new file mode 100644
index 0000000000..aec7994d3f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flowdefinition.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowDefinition AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowdefinition.html
+type FlowVersion_FlowDefinition struct {
+
+	// Connections AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowdefinition.html#cfn-bedrock-flowversion-flowdefinition-connections
+	Connections []FlowVersion_FlowConnection `json:"Connections,omitempty"`
+
+	// Nodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flowdefinition.html#cfn-bedrock-flowversion-flowdefinition-nodes
+	Nodes []FlowVersion_FlowNode `json:"Nodes,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 *FlowVersion_FlowDefinition) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowDefinition"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flownode.go b/cloudformation/bedrock/aws-bedrock-flowversion_flownode.go
new file mode 100644
index 0000000000..112b09eec6
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flownode.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowNode AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowNode)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownode.html
+type FlowVersion_FlowNode struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownode.html#cfn-bedrock-flowversion-flownode-configuration
+	Configuration *FlowVersion_FlowNodeConfiguration `json:"Configuration,omitempty"`
+
+	// Inputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownode.html#cfn-bedrock-flowversion-flownode-inputs
+	Inputs []FlowVersion_FlowNodeInput `json:"Inputs,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownode.html#cfn-bedrock-flowversion-flownode-name
+	Name string `json:"Name"`
+
+	// Outputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownode.html#cfn-bedrock-flowversion-flownode-outputs
+	Outputs []FlowVersion_FlowNodeOutput `json:"Outputs,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownode.html#cfn-bedrock-flowversion-flownode-type
+	Type string `json:"Type"`
+
+	// 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 *FlowVersion_FlowNode) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowNode"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_flownodeconfiguration.go
new file mode 100644
index 0000000000..9dd9c4bc56
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flownodeconfiguration.go
@@ -0,0 +1,92 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html
+type FlowVersion_FlowNodeConfiguration struct {
+
+	// Agent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-agent
+	Agent *FlowVersion_AgentFlowNodeConfiguration `json:"Agent,omitempty"`
+
+	// Collector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-collector
+	Collector interface{} `json:"Collector,omitempty"`
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-condition
+	Condition *FlowVersion_ConditionFlowNodeConfiguration `json:"Condition,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-input
+	Input interface{} `json:"Input,omitempty"`
+
+	// Iterator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-iterator
+	Iterator interface{} `json:"Iterator,omitempty"`
+
+	// KnowledgeBase AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-knowledgebase
+	KnowledgeBase *FlowVersion_KnowledgeBaseFlowNodeConfiguration `json:"KnowledgeBase,omitempty"`
+
+	// LambdaFunction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-lambdafunction
+	LambdaFunction *FlowVersion_LambdaFunctionFlowNodeConfiguration `json:"LambdaFunction,omitempty"`
+
+	// Lex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-lex
+	Lex *FlowVersion_LexFlowNodeConfiguration `json:"Lex,omitempty"`
+
+	// Output AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-output
+	Output interface{} `json:"Output,omitempty"`
+
+	// Prompt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-prompt
+	Prompt *FlowVersion_PromptFlowNodeConfiguration `json:"Prompt,omitempty"`
+
+	// Retrieval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-retrieval
+	Retrieval *FlowVersion_RetrievalFlowNodeConfiguration `json:"Retrieval,omitempty"`
+
+	// Storage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeconfiguration.html#cfn-bedrock-flowversion-flownodeconfiguration-storage
+	Storage *FlowVersion_StorageFlowNodeConfiguration `json:"Storage,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 *FlowVersion_FlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flownodeinput.go b/cloudformation/bedrock/aws-bedrock-flowversion_flownodeinput.go
new file mode 100644
index 0000000000..7eb30be1e3
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flownodeinput.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowNodeInput AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowNodeInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeinput.html
+type FlowVersion_FlowNodeInput struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeinput.html#cfn-bedrock-flowversion-flownodeinput-expression
+	Expression string `json:"Expression"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeinput.html#cfn-bedrock-flowversion-flownodeinput-name
+	Name string `json:"Name"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeinput.html#cfn-bedrock-flowversion-flownodeinput-type
+	Type string `json:"Type"`
+
+	// 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 *FlowVersion_FlowNodeInput) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowNodeInput"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_flownodeoutput.go b/cloudformation/bedrock/aws-bedrock-flowversion_flownodeoutput.go
new file mode 100644
index 0000000000..926d5498d2
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_flownodeoutput.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_FlowNodeOutput AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.FlowNodeOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeoutput.html
+type FlowVersion_FlowNodeOutput struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeoutput.html#cfn-bedrock-flowversion-flownodeoutput-name
+	Name string `json:"Name"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-flownodeoutput.html#cfn-bedrock-flowversion-flownodeoutput-type
+	Type string `json:"Type"`
+
+	// 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 *FlowVersion_FlowNodeOutput) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.FlowNodeOutput"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_knowledgebaseflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_knowledgebaseflownodeconfiguration.go
new file mode 100644
index 0000000000..dc75ab9634
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_knowledgebaseflownodeconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_KnowledgeBaseFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-knowledgebaseflownodeconfiguration.html
+type FlowVersion_KnowledgeBaseFlowNodeConfiguration struct {
+
+	// KnowledgeBaseId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-knowledgebaseflownodeconfiguration.html#cfn-bedrock-flowversion-knowledgebaseflownodeconfiguration-knowledgebaseid
+	KnowledgeBaseId string `json:"KnowledgeBaseId"`
+
+	// ModelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-knowledgebaseflownodeconfiguration.html#cfn-bedrock-flowversion-knowledgebaseflownodeconfiguration-modelid
+	ModelId *string `json:"ModelId,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 *FlowVersion_KnowledgeBaseFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_lambdafunctionflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_lambdafunctionflownodeconfiguration.go
new file mode 100644
index 0000000000..d2ce2b919d
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_lambdafunctionflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_LambdaFunctionFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-lambdafunctionflownodeconfiguration.html
+type FlowVersion_LambdaFunctionFlowNodeConfiguration struct {
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-lambdafunctionflownodeconfiguration.html#cfn-bedrock-flowversion-lambdafunctionflownodeconfiguration-lambdaarn
+	LambdaArn string `json:"LambdaArn"`
+
+	// 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 *FlowVersion_LambdaFunctionFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_lexflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_lexflownodeconfiguration.go
new file mode 100644
index 0000000000..75c3864067
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_lexflownodeconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_LexFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-lexflownodeconfiguration.html
+type FlowVersion_LexFlowNodeConfiguration struct {
+
+	// BotAliasArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-lexflownodeconfiguration.html#cfn-bedrock-flowversion-lexflownodeconfiguration-botaliasarn
+	BotAliasArn string `json:"BotAliasArn"`
+
+	// LocaleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-lexflownodeconfiguration.html#cfn-bedrock-flowversion-lexflownodeconfiguration-localeid
+	LocaleId string `json:"LocaleId"`
+
+	// 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 *FlowVersion_LexFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeconfiguration.go
new file mode 100644
index 0000000000..fde59e10c1
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodeconfiguration.html
+type FlowVersion_PromptFlowNodeConfiguration struct {
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodeconfiguration.html#cfn-bedrock-flowversion-promptflownodeconfiguration-sourceconfiguration
+	SourceConfiguration *FlowVersion_PromptFlowNodeSourceConfiguration `json:"SourceConfiguration"`
+
+	// 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 *FlowVersion_PromptFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeinlineconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeinlineconfiguration.go
new file mode 100644
index 0000000000..79f56a2a0f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodeinlineconfiguration.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptFlowNodeInlineConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodeinlineconfiguration.html
+type FlowVersion_PromptFlowNodeInlineConfiguration struct {
+
+	// InferenceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodeinlineconfiguration.html#cfn-bedrock-flowversion-promptflownodeinlineconfiguration-inferenceconfiguration
+	InferenceConfiguration *FlowVersion_PromptInferenceConfiguration `json:"InferenceConfiguration,omitempty"`
+
+	// ModelId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodeinlineconfiguration.html#cfn-bedrock-flowversion-promptflownodeinlineconfiguration-modelid
+	ModelId string `json:"ModelId"`
+
+	// TemplateConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodeinlineconfiguration.html#cfn-bedrock-flowversion-promptflownodeinlineconfiguration-templateconfiguration
+	TemplateConfiguration *FlowVersion_PromptTemplateConfiguration `json:"TemplateConfiguration"`
+
+	// TemplateType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodeinlineconfiguration.html#cfn-bedrock-flowversion-promptflownodeinlineconfiguration-templatetype
+	TemplateType string `json:"TemplateType"`
+
+	// 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 *FlowVersion_PromptFlowNodeInlineConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_promptflownoderesourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownoderesourceconfiguration.go
new file mode 100644
index 0000000000..74213bef63
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownoderesourceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptFlowNodeResourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownoderesourceconfiguration.html
+type FlowVersion_PromptFlowNodeResourceConfiguration struct {
+
+	// PromptArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownoderesourceconfiguration.html#cfn-bedrock-flowversion-promptflownoderesourceconfiguration-promptarn
+	PromptArn string `json:"PromptArn"`
+
+	// 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 *FlowVersion_PromptFlowNodeResourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodesourceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodesourceconfiguration.go
new file mode 100644
index 0000000000..92a0060265
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_promptflownodesourceconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptFlowNodeSourceConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodesourceconfiguration.html
+type FlowVersion_PromptFlowNodeSourceConfiguration struct {
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodesourceconfiguration.html#cfn-bedrock-flowversion-promptflownodesourceconfiguration-inline
+	Inline *FlowVersion_PromptFlowNodeInlineConfiguration `json:"Inline,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptflownodesourceconfiguration.html#cfn-bedrock-flowversion-promptflownodesourceconfiguration-resource
+	Resource *FlowVersion_PromptFlowNodeResourceConfiguration `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 *FlowVersion_PromptFlowNodeSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_promptinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_promptinferenceconfiguration.go
new file mode 100644
index 0000000000..11f3d149bb
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_promptinferenceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptinferenceconfiguration.html
+type FlowVersion_PromptInferenceConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptinferenceconfiguration.html#cfn-bedrock-flowversion-promptinferenceconfiguration-text
+	Text *FlowVersion_PromptModelInferenceConfiguration `json:"Text"`
+
+	// 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 *FlowVersion_PromptInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_promptinputvariable.go b/cloudformation/bedrock/aws-bedrock-flowversion_promptinputvariable.go
new file mode 100644
index 0000000000..01c8123c15
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_promptinputvariable.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptInputVariable AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptInputVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptinputvariable.html
+type FlowVersion_PromptInputVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptinputvariable.html#cfn-bedrock-flowversion-promptinputvariable-name
+	Name *string `json:"Name,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 *FlowVersion_PromptInputVariable) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptInputVariable"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_promptmodelinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_promptmodelinferenceconfiguration.go
new file mode 100644
index 0000000000..1ef49fad13
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_promptmodelinferenceconfiguration.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptModelInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptmodelinferenceconfiguration.html
+type FlowVersion_PromptModelInferenceConfiguration struct {
+
+	// MaxTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptmodelinferenceconfiguration.html#cfn-bedrock-flowversion-promptmodelinferenceconfiguration-maxtokens
+	MaxTokens *float64 `json:"MaxTokens,omitempty"`
+
+	// StopSequences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptmodelinferenceconfiguration.html#cfn-bedrock-flowversion-promptmodelinferenceconfiguration-stopsequences
+	StopSequences []string `json:"StopSequences,omitempty"`
+
+	// Temperature AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptmodelinferenceconfiguration.html#cfn-bedrock-flowversion-promptmodelinferenceconfiguration-temperature
+	Temperature *float64 `json:"Temperature,omitempty"`
+
+	// TopK AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptmodelinferenceconfiguration.html#cfn-bedrock-flowversion-promptmodelinferenceconfiguration-topk
+	TopK *float64 `json:"TopK,omitempty"`
+
+	// TopP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-promptmodelinferenceconfiguration.html#cfn-bedrock-flowversion-promptmodelinferenceconfiguration-topp
+	TopP *float64 `json:"TopP,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 *FlowVersion_PromptModelInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_prompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_prompttemplateconfiguration.go
new file mode 100644
index 0000000000..352b7a2c45
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_prompttemplateconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_PromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.PromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-prompttemplateconfiguration.html
+type FlowVersion_PromptTemplateConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-prompttemplateconfiguration.html#cfn-bedrock-flowversion-prompttemplateconfiguration-text
+	Text *FlowVersion_TextPromptTemplateConfiguration `json:"Text"`
+
+	// 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 *FlowVersion_PromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.PromptTemplateConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeconfiguration.go
new file mode 100644
index 0000000000..71a3e5aab8
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_RetrievalFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-retrievalflownodeconfiguration.html
+type FlowVersion_RetrievalFlowNodeConfiguration struct {
+
+	// ServiceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-retrievalflownodeconfiguration.html#cfn-bedrock-flowversion-retrievalflownodeconfiguration-serviceconfiguration
+	ServiceConfiguration *FlowVersion_RetrievalFlowNodeServiceConfiguration `json:"ServiceConfiguration"`
+
+	// 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 *FlowVersion_RetrievalFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodes3configuration.go b/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodes3configuration.go
new file mode 100644
index 0000000000..c9a367fad2
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodes3configuration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_RetrievalFlowNodeS3Configuration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-retrievalflownodes3configuration.html
+type FlowVersion_RetrievalFlowNodeS3Configuration struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-retrievalflownodes3configuration.html#cfn-bedrock-flowversion-retrievalflownodes3configuration-bucketname
+	BucketName string `json:"BucketName"`
+
+	// 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 *FlowVersion_RetrievalFlowNodeS3Configuration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeserviceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeserviceconfiguration.go
new file mode 100644
index 0000000000..03f56ffa7f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_retrievalflownodeserviceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_RetrievalFlowNodeServiceConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-retrievalflownodeserviceconfiguration.html
+type FlowVersion_RetrievalFlowNodeServiceConfiguration struct {
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-retrievalflownodeserviceconfiguration.html#cfn-bedrock-flowversion-retrievalflownodeserviceconfiguration-s3
+	S3 *FlowVersion_RetrievalFlowNodeS3Configuration `json:"S3,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 *FlowVersion_RetrievalFlowNodeServiceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeconfiguration.go
new file mode 100644
index 0000000000..cdf0f940b4
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_StorageFlowNodeConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-storageflownodeconfiguration.html
+type FlowVersion_StorageFlowNodeConfiguration struct {
+
+	// ServiceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-storageflownodeconfiguration.html#cfn-bedrock-flowversion-storageflownodeconfiguration-serviceconfiguration
+	ServiceConfiguration *FlowVersion_StorageFlowNodeServiceConfiguration `json:"ServiceConfiguration"`
+
+	// 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 *FlowVersion_StorageFlowNodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodes3configuration.go b/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodes3configuration.go
new file mode 100644
index 0000000000..506d0997d2
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodes3configuration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_StorageFlowNodeS3Configuration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-storageflownodes3configuration.html
+type FlowVersion_StorageFlowNodeS3Configuration struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-storageflownodes3configuration.html#cfn-bedrock-flowversion-storageflownodes3configuration-bucketname
+	BucketName string `json:"BucketName"`
+
+	// 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 *FlowVersion_StorageFlowNodeS3Configuration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeserviceconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeserviceconfiguration.go
new file mode 100644
index 0000000000..76c373d375
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_storageflownodeserviceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_StorageFlowNodeServiceConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-storageflownodeserviceconfiguration.html
+type FlowVersion_StorageFlowNodeServiceConfiguration struct {
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-storageflownodeserviceconfiguration.html#cfn-bedrock-flowversion-storageflownodeserviceconfiguration-s3
+	S3 *FlowVersion_StorageFlowNodeS3Configuration `json:"S3,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 *FlowVersion_StorageFlowNodeServiceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-flowversion_textprompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-flowversion_textprompttemplateconfiguration.go
new file mode 100644
index 0000000000..6a9a17816e
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-flowversion_textprompttemplateconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowVersion_TextPromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-textprompttemplateconfiguration.html
+type FlowVersion_TextPromptTemplateConfiguration struct {
+
+	// InputVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-textprompttemplateconfiguration.html#cfn-bedrock-flowversion-textprompttemplateconfiguration-inputvariables
+	InputVariables []FlowVersion_PromptInputVariable `json:"InputVariables,omitempty"`
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-flowversion-textprompttemplateconfiguration.html#cfn-bedrock-flowversion-textprompttemplateconfiguration-text
+	Text string `json:"Text"`
+
+	// 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 *FlowVersion_TextPromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-guardrail.go b/cloudformation/bedrock/aws-bedrock-guardrail.go
index a27b458180..198c2a4a50 100644
--- a/cloudformation/bedrock/aws-bedrock-guardrail.go
+++ b/cloudformation/bedrock/aws-bedrock-guardrail.go
@@ -29,6 +29,11 @@ type Guardrail struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-contentpolicyconfig
 	ContentPolicyConfig *Guardrail_ContentPolicyConfig `json:"ContentPolicyConfig,omitempty"`
 
+	// ContextualGroundingPolicyConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-contextualgroundingpolicyconfig
+	ContextualGroundingPolicyConfig *Guardrail_ContextualGroundingPolicyConfig `json:"ContextualGroundingPolicyConfig,omitempty"`
+
 	// Description AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrail.html#cfn-bedrock-guardrail-description
diff --git a/cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingfilterconfig.go b/cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingfilterconfig.go
new file mode 100644
index 0000000000..685fbf77e7
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingfilterconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Guardrail_ContextualGroundingFilterConfig AWS CloudFormation Resource (AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-guardrail-contextualgroundingfilterconfig.html
+type Guardrail_ContextualGroundingFilterConfig struct {
+
+	// Threshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-guardrail-contextualgroundingfilterconfig.html#cfn-bedrock-guardrail-contextualgroundingfilterconfig-threshold
+	Threshold float64 `json:"Threshold"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-guardrail-contextualgroundingfilterconfig.html#cfn-bedrock-guardrail-contextualgroundingfilterconfig-type
+	Type string `json:"Type"`
+
+	// 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 *Guardrail_ContextualGroundingFilterConfig) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingpolicyconfig.go b/cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingpolicyconfig.go
new file mode 100644
index 0000000000..0f0427023e
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-guardrail_contextualgroundingpolicyconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Guardrail_ContextualGroundingPolicyConfig AWS CloudFormation Resource (AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-guardrail-contextualgroundingpolicyconfig.html
+type Guardrail_ContextualGroundingPolicyConfig struct {
+
+	// FiltersConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-guardrail-contextualgroundingpolicyconfig.html#cfn-bedrock-guardrail-contextualgroundingpolicyconfig-filtersconfig
+	FiltersConfig []Guardrail_ContextualGroundingFilterConfig `json:"FiltersConfig"`
+
+	// 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 *Guardrail_ContextualGroundingPolicyConfig) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-guardrailversion.go b/cloudformation/bedrock/aws-bedrock-guardrailversion.go
new file mode 100644
index 0000000000..60eccfcb7b
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-guardrailversion.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// GuardrailVersion AWS CloudFormation Resource (AWS::Bedrock::GuardrailVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrailversion.html
+type GuardrailVersion struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrailversion.html#cfn-bedrock-guardrailversion-description
+	Description *string `json:"Description,omitempty"`
+
+	// GuardrailIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-guardrailversion.html#cfn-bedrock-guardrailversion-guardrailidentifier
+	GuardrailIdentifier string `json:"GuardrailIdentifier"`
+
+	// 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 *GuardrailVersion) AWSCloudFormationType() string {
+	return "AWS::Bedrock::GuardrailVersion"
+}
+
+// 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 GuardrailVersion) MarshalJSON() ([]byte, error) {
+	type Properties GuardrailVersion
+	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 *GuardrailVersion) UnmarshalJSON(b []byte) error {
+	type Properties GuardrailVersion
+	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 = GuardrailVersion(*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/bedrock/aws-bedrock-knowledgebase_bedrockembeddingmodelconfiguration.go b/cloudformation/bedrock/aws-bedrock-knowledgebase_bedrockembeddingmodelconfiguration.go
new file mode 100644
index 0000000000..c70e25bbdf
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-knowledgebase_bedrockembeddingmodelconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// KnowledgeBase_BedrockEmbeddingModelConfiguration AWS CloudFormation Resource (AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-bedrockembeddingmodelconfiguration.html
+type KnowledgeBase_BedrockEmbeddingModelConfiguration struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-bedrockembeddingmodelconfiguration.html#cfn-bedrock-knowledgebase-bedrockembeddingmodelconfiguration-dimensions
+	Dimensions *int `json:"Dimensions,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 *KnowledgeBase_BedrockEmbeddingModelConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-knowledgebase_embeddingmodelconfiguration.go b/cloudformation/bedrock/aws-bedrock-knowledgebase_embeddingmodelconfiguration.go
new file mode 100644
index 0000000000..4e3dd7c6cf
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-knowledgebase_embeddingmodelconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// KnowledgeBase_EmbeddingModelConfiguration AWS CloudFormation Resource (AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-embeddingmodelconfiguration.html
+type KnowledgeBase_EmbeddingModelConfiguration struct {
+
+	// BedrockEmbeddingModelConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-embeddingmodelconfiguration.html#cfn-bedrock-knowledgebase-embeddingmodelconfiguration-bedrockembeddingmodelconfiguration
+	BedrockEmbeddingModelConfiguration *KnowledgeBase_BedrockEmbeddingModelConfiguration `json:"BedrockEmbeddingModelConfiguration,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 *KnowledgeBase_EmbeddingModelConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasconfiguration.go b/cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasconfiguration.go
new file mode 100644
index 0000000000..33f78a7a9c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasconfiguration.go
@@ -0,0 +1,67 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// KnowledgeBase_MongoDbAtlasConfiguration AWS CloudFormation Resource (AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html
+type KnowledgeBase_MongoDbAtlasConfiguration struct {
+
+	// CollectionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html#cfn-bedrock-knowledgebase-mongodbatlasconfiguration-collectionname
+	CollectionName string `json:"CollectionName"`
+
+	// CredentialsSecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html#cfn-bedrock-knowledgebase-mongodbatlasconfiguration-credentialssecretarn
+	CredentialsSecretArn string `json:"CredentialsSecretArn"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html#cfn-bedrock-knowledgebase-mongodbatlasconfiguration-databasename
+	DatabaseName string `json:"DatabaseName"`
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html#cfn-bedrock-knowledgebase-mongodbatlasconfiguration-endpoint
+	Endpoint string `json:"Endpoint"`
+
+	// EndpointServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html#cfn-bedrock-knowledgebase-mongodbatlasconfiguration-endpointservicename
+	EndpointServiceName *string `json:"EndpointServiceName,omitempty"`
+
+	// FieldMapping AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html#cfn-bedrock-knowledgebase-mongodbatlasconfiguration-fieldmapping
+	FieldMapping *KnowledgeBase_MongoDbAtlasFieldMapping `json:"FieldMapping"`
+
+	// VectorIndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasconfiguration.html#cfn-bedrock-knowledgebase-mongodbatlasconfiguration-vectorindexname
+	VectorIndexName string `json:"VectorIndexName"`
+
+	// 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 *KnowledgeBase_MongoDbAtlasConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasfieldmapping.go b/cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasfieldmapping.go
new file mode 100644
index 0000000000..a5e0fbcab9
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-knowledgebase_mongodbatlasfieldmapping.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// KnowledgeBase_MongoDbAtlasFieldMapping AWS CloudFormation Resource (AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasfieldmapping.html
+type KnowledgeBase_MongoDbAtlasFieldMapping struct {
+
+	// MetadataField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasfieldmapping.html#cfn-bedrock-knowledgebase-mongodbatlasfieldmapping-metadatafield
+	MetadataField string `json:"MetadataField"`
+
+	// TextField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasfieldmapping.html#cfn-bedrock-knowledgebase-mongodbatlasfieldmapping-textfield
+	TextField string `json:"TextField"`
+
+	// VectorField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-mongodbatlasfieldmapping.html#cfn-bedrock-knowledgebase-mongodbatlasfieldmapping-vectorfield
+	VectorField string `json:"VectorField"`
+
+	// 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 *KnowledgeBase_MongoDbAtlasFieldMapping) AWSCloudFormationType() string {
+	return "AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-knowledgebase_storageconfiguration.go b/cloudformation/bedrock/aws-bedrock-knowledgebase_storageconfiguration.go
index afc29c690e..4b64d14e83 100644
--- a/cloudformation/bedrock/aws-bedrock-knowledgebase_storageconfiguration.go
+++ b/cloudformation/bedrock/aws-bedrock-knowledgebase_storageconfiguration.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-storageconfiguration.html
 type KnowledgeBase_StorageConfiguration struct {
 
+	// MongoDbAtlasConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-storageconfiguration.html#cfn-bedrock-knowledgebase-storageconfiguration-mongodbatlasconfiguration
+	MongoDbAtlasConfiguration *KnowledgeBase_MongoDbAtlasConfiguration `json:"MongoDbAtlasConfiguration,omitempty"`
+
 	// OpensearchServerlessConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-storageconfiguration.html#cfn-bedrock-knowledgebase-storageconfiguration-opensearchserverlessconfiguration
diff --git a/cloudformation/bedrock/aws-bedrock-knowledgebase_vectorknowledgebaseconfiguration.go b/cloudformation/bedrock/aws-bedrock-knowledgebase_vectorknowledgebaseconfiguration.go
index c7111b5a38..818d5d6f38 100644
--- a/cloudformation/bedrock/aws-bedrock-knowledgebase_vectorknowledgebaseconfiguration.go
+++ b/cloudformation/bedrock/aws-bedrock-knowledgebase_vectorknowledgebaseconfiguration.go
@@ -15,6 +15,11 @@ type KnowledgeBase_VectorKnowledgeBaseConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-vectorknowledgebaseconfiguration-embeddingmodelarn
 	EmbeddingModelArn string `json:"EmbeddingModelArn"`
 
+	// EmbeddingModelConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-knowledgebase-vectorknowledgebaseconfiguration.html#cfn-bedrock-knowledgebase-vectorknowledgebaseconfiguration-embeddingmodelconfiguration
+	EmbeddingModelConfiguration *KnowledgeBase_EmbeddingModelConfiguration `json:"EmbeddingModelConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/bedrock/aws-bedrock-prompt.go b/cloudformation/bedrock/aws-bedrock-prompt.go
new file mode 100644
index 0000000000..59b42b221f
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt.go
@@ -0,0 +1,142 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt AWS CloudFormation Resource (AWS::Bedrock::Prompt)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html
+type Prompt struct {
+
+	// CustomerEncryptionKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html#cfn-bedrock-prompt-customerencryptionkeyarn
+	CustomerEncryptionKeyArn *string `json:"CustomerEncryptionKeyArn,omitempty"`
+
+	// DefaultVariant AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html#cfn-bedrock-prompt-defaultvariant
+	DefaultVariant *string `json:"DefaultVariant,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html#cfn-bedrock-prompt-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html#cfn-bedrock-prompt-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html#cfn-bedrock-prompt-tags
+	Tags map[string]string `json:"Tags,omitempty"`
+
+	// Variants AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-prompt.html#cfn-bedrock-prompt-variants
+	Variants []Prompt_PromptVariant `json:"Variants,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 *Prompt) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt"
+}
+
+// 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 Prompt) MarshalJSON() ([]byte, error) {
+	type Properties Prompt
+	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 *Prompt) UnmarshalJSON(b []byte) error {
+	type Properties Prompt
+	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 = Prompt(*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/bedrock/aws-bedrock-prompt_promptinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-prompt_promptinferenceconfiguration.go
new file mode 100644
index 0000000000..86ab9b1b1a
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt_promptinferenceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt_PromptInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Prompt.PromptInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinferenceconfiguration.html
+type Prompt_PromptInferenceConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinferenceconfiguration.html#cfn-bedrock-prompt-promptinferenceconfiguration-text
+	Text *Prompt_PromptModelInferenceConfiguration `json:"Text"`
+
+	// 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 *Prompt_PromptInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt.PromptInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-prompt_promptinputvariable.go b/cloudformation/bedrock/aws-bedrock-prompt_promptinputvariable.go
new file mode 100644
index 0000000000..1241dd49c9
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt_promptinputvariable.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt_PromptInputVariable AWS CloudFormation Resource (AWS::Bedrock::Prompt.PromptInputVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinputvariable.html
+type Prompt_PromptInputVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptinputvariable.html#cfn-bedrock-prompt-promptinputvariable-name
+	Name *string `json:"Name,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 *Prompt_PromptInputVariable) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt.PromptInputVariable"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-prompt_promptmodelinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-prompt_promptmodelinferenceconfiguration.go
new file mode 100644
index 0000000000..aaee1a0773
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt_promptmodelinferenceconfiguration.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt_PromptModelInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::Prompt.PromptModelInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptmodelinferenceconfiguration.html
+type Prompt_PromptModelInferenceConfiguration struct {
+
+	// MaxTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptmodelinferenceconfiguration.html#cfn-bedrock-prompt-promptmodelinferenceconfiguration-maxtokens
+	MaxTokens *float64 `json:"MaxTokens,omitempty"`
+
+	// StopSequences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptmodelinferenceconfiguration.html#cfn-bedrock-prompt-promptmodelinferenceconfiguration-stopsequences
+	StopSequences []string `json:"StopSequences,omitempty"`
+
+	// Temperature AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptmodelinferenceconfiguration.html#cfn-bedrock-prompt-promptmodelinferenceconfiguration-temperature
+	Temperature *float64 `json:"Temperature,omitempty"`
+
+	// TopK AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptmodelinferenceconfiguration.html#cfn-bedrock-prompt-promptmodelinferenceconfiguration-topk
+	TopK *float64 `json:"TopK,omitempty"`
+
+	// TopP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptmodelinferenceconfiguration.html#cfn-bedrock-prompt-promptmodelinferenceconfiguration-topp
+	TopP *float64 `json:"TopP,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 *Prompt_PromptModelInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt.PromptModelInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-prompt_prompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-prompt_prompttemplateconfiguration.go
new file mode 100644
index 0000000000..5d72eaaa5c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt_prompttemplateconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt_PromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::Prompt.PromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-prompttemplateconfiguration.html
+type Prompt_PromptTemplateConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-prompttemplateconfiguration.html#cfn-bedrock-prompt-prompttemplateconfiguration-text
+	Text *Prompt_TextPromptTemplateConfiguration `json:"Text"`
+
+	// 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 *Prompt_PromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt.PromptTemplateConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-prompt_promptvariant.go b/cloudformation/bedrock/aws-bedrock-prompt_promptvariant.go
new file mode 100644
index 0000000000..8ea9cb354c
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt_promptvariant.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt_PromptVariant AWS CloudFormation Resource (AWS::Bedrock::Prompt.PromptVariant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptvariant.html
+type Prompt_PromptVariant struct {
+
+	// InferenceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptvariant.html#cfn-bedrock-prompt-promptvariant-inferenceconfiguration
+	InferenceConfiguration *Prompt_PromptInferenceConfiguration `json:"InferenceConfiguration,omitempty"`
+
+	// ModelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptvariant.html#cfn-bedrock-prompt-promptvariant-modelid
+	ModelId *string `json:"ModelId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptvariant.html#cfn-bedrock-prompt-promptvariant-name
+	Name string `json:"Name"`
+
+	// TemplateConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptvariant.html#cfn-bedrock-prompt-promptvariant-templateconfiguration
+	TemplateConfiguration *Prompt_PromptTemplateConfiguration `json:"TemplateConfiguration,omitempty"`
+
+	// TemplateType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-promptvariant.html#cfn-bedrock-prompt-promptvariant-templatetype
+	TemplateType string `json:"TemplateType"`
+
+	// 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 *Prompt_PromptVariant) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt.PromptVariant"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-prompt_textprompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-prompt_textprompttemplateconfiguration.go
new file mode 100644
index 0000000000..958845cb28
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt_textprompttemplateconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt_TextPromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::Prompt.TextPromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-textprompttemplateconfiguration.html
+type Prompt_TextPromptTemplateConfiguration struct {
+
+	// InputVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-textprompttemplateconfiguration.html#cfn-bedrock-prompt-textprompttemplateconfiguration-inputvariables
+	InputVariables []Prompt_PromptInputVariable `json:"InputVariables,omitempty"`
+
+	// Text AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-textprompttemplateconfiguration.html#cfn-bedrock-prompt-textprompttemplateconfiguration-text
+	Text *string `json:"Text,omitempty"`
+
+	// TextS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-textprompttemplateconfiguration.html#cfn-bedrock-prompt-textprompttemplateconfiguration-texts3location
+	TextS3Location *Prompt_TextS3Location `json:"TextS3Location,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 *Prompt_TextPromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt.TextPromptTemplateConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-prompt_texts3location.go b/cloudformation/bedrock/aws-bedrock-prompt_texts3location.go
new file mode 100644
index 0000000000..d9816b1c15
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-prompt_texts3location.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Prompt_TextS3Location AWS CloudFormation Resource (AWS::Bedrock::Prompt.TextS3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-texts3location.html
+type Prompt_TextS3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-texts3location.html#cfn-bedrock-prompt-texts3location-bucket
+	Bucket string `json:"Bucket"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-texts3location.html#cfn-bedrock-prompt-texts3location-key
+	Key string `json:"Key"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-prompt-texts3location.html#cfn-bedrock-prompt-texts3location-version
+	Version *string `json:"Version,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 *Prompt_TextS3Location) AWSCloudFormationType() string {
+	return "AWS::Bedrock::Prompt.TextS3Location"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-promptversion.go b/cloudformation/bedrock/aws-bedrock-promptversion.go
new file mode 100644
index 0000000000..0a7c314b01
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-promptversion.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PromptVersion AWS CloudFormation Resource (AWS::Bedrock::PromptVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-promptversion.html
+type PromptVersion struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-promptversion.html#cfn-bedrock-promptversion-description
+	Description *string `json:"Description,omitempty"`
+
+	// PromptArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-promptversion.html#cfn-bedrock-promptversion-promptarn
+	PromptArn string `json:"PromptArn"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-bedrock-promptversion.html#cfn-bedrock-promptversion-tags
+	Tags map[string]string `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 *PromptVersion) AWSCloudFormationType() string {
+	return "AWS::Bedrock::PromptVersion"
+}
+
+// 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 PromptVersion) MarshalJSON() ([]byte, error) {
+	type Properties PromptVersion
+	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 *PromptVersion) UnmarshalJSON(b []byte) error {
+	type Properties PromptVersion
+	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 = PromptVersion(*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/bedrock/aws-bedrock-promptversion_promptinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-promptversion_promptinferenceconfiguration.go
new file mode 100644
index 0000000000..9e07148a17
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-promptversion_promptinferenceconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PromptVersion_PromptInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::PromptVersion.PromptInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptinferenceconfiguration.html
+type PromptVersion_PromptInferenceConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptinferenceconfiguration.html#cfn-bedrock-promptversion-promptinferenceconfiguration-text
+	Text *PromptVersion_PromptModelInferenceConfiguration `json:"Text"`
+
+	// 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 *PromptVersion_PromptInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::PromptVersion.PromptInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-promptversion_promptinputvariable.go b/cloudformation/bedrock/aws-bedrock-promptversion_promptinputvariable.go
new file mode 100644
index 0000000000..289c2f2fbe
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-promptversion_promptinputvariable.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PromptVersion_PromptInputVariable AWS CloudFormation Resource (AWS::Bedrock::PromptVersion.PromptInputVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptinputvariable.html
+type PromptVersion_PromptInputVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptinputvariable.html#cfn-bedrock-promptversion-promptinputvariable-name
+	Name *string `json:"Name,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 *PromptVersion_PromptInputVariable) AWSCloudFormationType() string {
+	return "AWS::Bedrock::PromptVersion.PromptInputVariable"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-promptversion_promptmodelinferenceconfiguration.go b/cloudformation/bedrock/aws-bedrock-promptversion_promptmodelinferenceconfiguration.go
new file mode 100644
index 0000000000..2cd732bab0
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-promptversion_promptmodelinferenceconfiguration.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PromptVersion_PromptModelInferenceConfiguration AWS CloudFormation Resource (AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptmodelinferenceconfiguration.html
+type PromptVersion_PromptModelInferenceConfiguration struct {
+
+	// MaxTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptmodelinferenceconfiguration.html#cfn-bedrock-promptversion-promptmodelinferenceconfiguration-maxtokens
+	MaxTokens *float64 `json:"MaxTokens,omitempty"`
+
+	// StopSequences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptmodelinferenceconfiguration.html#cfn-bedrock-promptversion-promptmodelinferenceconfiguration-stopsequences
+	StopSequences []string `json:"StopSequences,omitempty"`
+
+	// Temperature AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptmodelinferenceconfiguration.html#cfn-bedrock-promptversion-promptmodelinferenceconfiguration-temperature
+	Temperature *float64 `json:"Temperature,omitempty"`
+
+	// TopK AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptmodelinferenceconfiguration.html#cfn-bedrock-promptversion-promptmodelinferenceconfiguration-topk
+	TopK *float64 `json:"TopK,omitempty"`
+
+	// TopP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptmodelinferenceconfiguration.html#cfn-bedrock-promptversion-promptmodelinferenceconfiguration-topp
+	TopP *float64 `json:"TopP,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 *PromptVersion_PromptModelInferenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-promptversion_prompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-promptversion_prompttemplateconfiguration.go
new file mode 100644
index 0000000000..b023e9b189
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-promptversion_prompttemplateconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PromptVersion_PromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::PromptVersion.PromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-prompttemplateconfiguration.html
+type PromptVersion_PromptTemplateConfiguration struct {
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-prompttemplateconfiguration.html#cfn-bedrock-promptversion-prompttemplateconfiguration-text
+	Text *PromptVersion_TextPromptTemplateConfiguration `json:"Text"`
+
+	// 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 *PromptVersion_PromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::PromptVersion.PromptTemplateConfiguration"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-promptversion_promptvariant.go b/cloudformation/bedrock/aws-bedrock-promptversion_promptvariant.go
new file mode 100644
index 0000000000..81db868285
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-promptversion_promptvariant.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PromptVersion_PromptVariant AWS CloudFormation Resource (AWS::Bedrock::PromptVersion.PromptVariant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptvariant.html
+type PromptVersion_PromptVariant struct {
+
+	// InferenceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptvariant.html#cfn-bedrock-promptversion-promptvariant-inferenceconfiguration
+	InferenceConfiguration *PromptVersion_PromptInferenceConfiguration `json:"InferenceConfiguration,omitempty"`
+
+	// ModelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptvariant.html#cfn-bedrock-promptversion-promptvariant-modelid
+	ModelId *string `json:"ModelId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptvariant.html#cfn-bedrock-promptversion-promptvariant-name
+	Name string `json:"Name"`
+
+	// TemplateConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptvariant.html#cfn-bedrock-promptversion-promptvariant-templateconfiguration
+	TemplateConfiguration *PromptVersion_PromptTemplateConfiguration `json:"TemplateConfiguration,omitempty"`
+
+	// TemplateType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-promptvariant.html#cfn-bedrock-promptversion-promptvariant-templatetype
+	TemplateType string `json:"TemplateType"`
+
+	// 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 *PromptVersion_PromptVariant) AWSCloudFormationType() string {
+	return "AWS::Bedrock::PromptVersion.PromptVariant"
+}
diff --git a/cloudformation/bedrock/aws-bedrock-promptversion_textprompttemplateconfiguration.go b/cloudformation/bedrock/aws-bedrock-promptversion_textprompttemplateconfiguration.go
new file mode 100644
index 0000000000..da435d7a96
--- /dev/null
+++ b/cloudformation/bedrock/aws-bedrock-promptversion_textprompttemplateconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package bedrock
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PromptVersion_TextPromptTemplateConfiguration AWS CloudFormation Resource (AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-textprompttemplateconfiguration.html
+type PromptVersion_TextPromptTemplateConfiguration struct {
+
+	// InputVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-textprompttemplateconfiguration.html#cfn-bedrock-promptversion-textprompttemplateconfiguration-inputvariables
+	InputVariables []PromptVersion_PromptInputVariable `json:"InputVariables,omitempty"`
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-bedrock-promptversion-textprompttemplateconfiguration.html#cfn-bedrock-promptversion-textprompttemplateconfiguration-text
+	Text string `json:"Text"`
+
+	// 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 *PromptVersion_TextPromptTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration"
+}
diff --git a/cloudformation/budgets/aws-budgets-budget.go b/cloudformation/budgets/aws-budgets-budget.go
index eeedd73198..a690d1f9ae 100644
--- a/cloudformation/budgets/aws-budgets-budget.go
+++ b/cloudformation/budgets/aws-budgets-budget.go
@@ -23,6 +23,11 @@ type Budget struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budget.html#cfn-budgets-budget-notificationswithsubscribers
 	NotificationsWithSubscribers []Budget_NotificationWithSubscribers `json:"NotificationsWithSubscribers,omitempty"`
 
+	// ResourceTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budget.html#cfn-budgets-budget-resourcetags
+	ResourceTags []Budget_ResourceTag `json:"ResourceTags,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/budgets/aws-budgets-budget_resourcetag.go b/cloudformation/budgets/aws-budgets-budget_resourcetag.go
new file mode 100644
index 0000000000..8ccfc5d399
--- /dev/null
+++ b/cloudformation/budgets/aws-budgets-budget_resourcetag.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package budgets
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Budget_ResourceTag AWS CloudFormation Resource (AWS::Budgets::Budget.ResourceTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-resourcetag.html
+type Budget_ResourceTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-resourcetag.html#cfn-budgets-budget-resourcetag-key
+	Key string `json:"Key"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-resourcetag.html#cfn-budgets-budget-resourcetag-value
+	Value *string `json:"Value,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 *Budget_ResourceTag) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.ResourceTag"
+}
diff --git a/cloudformation/budgets/aws-budgets-budgetsaction.go b/cloudformation/budgets/aws-budgets-budgetsaction.go
index 8ad1b45ce9..d5ff8dd33b 100644
--- a/cloudformation/budgets/aws-budgets-budgetsaction.go
+++ b/cloudformation/budgets/aws-budgets-budgetsaction.go
@@ -48,6 +48,11 @@ type BudgetsAction struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-notificationtype
 	NotificationType string `json:"NotificationType"`
 
+	// ResourceTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-resourcetags
+	ResourceTags []BudgetsAction_ResourceTag `json:"ResourceTags,omitempty"`
+
 	// Subscribers AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-subscribers
diff --git a/cloudformation/budgets/aws-budgets-budgetsaction_resourcetag.go b/cloudformation/budgets/aws-budgets-budgetsaction_resourcetag.go
new file mode 100644
index 0000000000..827828a644
--- /dev/null
+++ b/cloudformation/budgets/aws-budgets-budgetsaction_resourcetag.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package budgets
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// BudgetsAction_ResourceTag AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.ResourceTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-resourcetag.html
+type BudgetsAction_ResourceTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-resourcetag.html#cfn-budgets-budgetsaction-resourcetag-key
+	Key string `json:"Key"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-resourcetag.html#cfn-budgets-budgetsaction-resourcetag-value
+	Value string `json:"Value"`
+
+	// 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 *BudgetsAction_ResourceTag) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction.ResourceTag"
+}
diff --git a/cloudformation/chatbot/aws-chatbot-microsoftteamschannelconfiguration.go b/cloudformation/chatbot/aws-chatbot-microsoftteamschannelconfiguration.go
index 3e95c13f6e..75ec742ab8 100644
--- a/cloudformation/chatbot/aws-chatbot-microsoftteamschannelconfiguration.go
+++ b/cloudformation/chatbot/aws-chatbot-microsoftteamschannelconfiguration.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // MicrosoftTeamsChannelConfiguration AWS CloudFormation Resource (AWS::Chatbot::MicrosoftTeamsChannelConfiguration)
@@ -38,6 +39,11 @@ type MicrosoftTeamsChannelConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-microsoftteamschannelconfiguration.html#cfn-chatbot-microsoftteamschannelconfiguration-snstopicarns
 	SnsTopicArns []string `json:"SnsTopicArns,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-microsoftteamschannelconfiguration.html#cfn-chatbot-microsoftteamschannelconfiguration-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// TeamId AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-microsoftteamschannelconfiguration.html#cfn-chatbot-microsoftteamschannelconfiguration-teamid
diff --git a/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go b/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
index 94e6b00eee..fbe3b225c9 100644
--- a/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
+++ b/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // SlackChannelConfiguration AWS CloudFormation Resource (AWS::Chatbot::SlackChannelConfiguration)
@@ -48,6 +49,11 @@ type SlackChannelConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-snstopicarns
 	SnsTopicArns []string `json:"SnsTopicArns,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// UserRoleRequired AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-userrolerequired
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisruleaggregation.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisruleaggregation.go
index 10d35e388e..bf3bc9f81c 100644
--- a/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisruleaggregation.go
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisruleaggregation.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisruleaggregation.html
 type ConfiguredTable_AnalysisRuleAggregation struct {
 
+	// AdditionalAnalyses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisruleaggregation.html#cfn-cleanrooms-configuredtable-analysisruleaggregation-additionalanalyses
+	AdditionalAnalyses *string `json:"AdditionalAnalyses,omitempty"`
+
 	// AggregateColumns AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisruleaggregation.html#cfn-cleanrooms-configuredtable-analysisruleaggregation-aggregatecolumns
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulecustom.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulecustom.go
index ae09e06085..200fd5af9b 100644
--- a/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulecustom.go
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulecustom.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulecustom.html
 type ConfiguredTable_AnalysisRuleCustom struct {
 
+	// AdditionalAnalyses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulecustom.html#cfn-cleanrooms-configuredtable-analysisrulecustom-additionalanalyses
+	AdditionalAnalyses *string `json:"AdditionalAnalyses,omitempty"`
+
 	// AllowedAnalyses AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulecustom.html#cfn-cleanrooms-configuredtable-analysisrulecustom-allowedanalyses
@@ -25,6 +30,11 @@ type ConfiguredTable_AnalysisRuleCustom struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulecustom.html#cfn-cleanrooms-configuredtable-analysisrulecustom-differentialprivacy
 	DifferentialPrivacy *ConfiguredTable_DifferentialPrivacy `json:"DifferentialPrivacy,omitempty"`
 
+	// DisallowedOutputColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulecustom.html#cfn-cleanrooms-configuredtable-analysisrulecustom-disallowedoutputcolumns
+	DisallowedOutputColumns []string `json:"DisallowedOutputColumns,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulelist.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulelist.go
index 281e923ad3..d7ff18cc77 100644
--- a/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulelist.go
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtable_analysisrulelist.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulelist.html
 type ConfiguredTable_AnalysisRuleList struct {
 
+	// AdditionalAnalyses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulelist.html#cfn-cleanrooms-configuredtable-analysisrulelist-additionalanalyses
+	AdditionalAnalyses *string `json:"AdditionalAnalyses,omitempty"`
+
 	// AllowedJoinOperators AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtable-analysisrulelist.html#cfn-cleanrooms-configuredtable-analysisrulelist-allowedjoinoperators
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation.go
index 1eefe47767..f5a53cee49 100644
--- a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation.go
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation.go
@@ -14,6 +14,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-configuredtableassociation.html
 type ConfiguredTableAssociation struct {
 
+	// ConfiguredTableAssociationAnalysisRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-configuredtableassociation.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrules
+	ConfiguredTableAssociationAnalysisRules []ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRule `json:"ConfiguredTableAssociationAnalysisRules,omitempty"`
+
 	// ConfiguredTableIdentifier AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-configuredtableassociation.html#cfn-cleanrooms-configuredtableassociation-configuredtableidentifier
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrule.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrule.go
new file mode 100644
index 0000000000..8b2dcf80f0
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrule.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRule AWS CloudFormation Resource (AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrule.html
+type ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRule struct {
+
+	// Policy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrule.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrule-policy
+	Policy *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicy `json:"Policy"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrule.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrule-type
+	Type string `json:"Type"`
+
+	// 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 *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRule) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisruleaggregation.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisruleaggregation.go
new file mode 100644
index 0000000000..c0729d6eb0
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisruleaggregation.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleAggregation AWS CloudFormation Resource (AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisruleaggregation.html
+type ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleAggregation struct {
+
+	// AllowedAdditionalAnalyses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisruleaggregation.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisruleaggregation-allowedadditionalanalyses
+	AllowedAdditionalAnalyses []string `json:"AllowedAdditionalAnalyses,omitempty"`
+
+	// AllowedResultReceivers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisruleaggregation.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisruleaggregation-allowedresultreceivers
+	AllowedResultReceivers []string `json:"AllowedResultReceivers,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 *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleAggregation) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulecustom.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulecustom.go
new file mode 100644
index 0000000000..e0ea799b79
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulecustom.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleCustom AWS CloudFormation Resource (AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulecustom.html
+type ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleCustom struct {
+
+	// AllowedAdditionalAnalyses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulecustom.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulecustom-allowedadditionalanalyses
+	AllowedAdditionalAnalyses []string `json:"AllowedAdditionalAnalyses,omitempty"`
+
+	// AllowedResultReceivers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulecustom.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulecustom-allowedresultreceivers
+	AllowedResultReceivers []string `json:"AllowedResultReceivers,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 *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleCustom) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulelist.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulelist.go
new file mode 100644
index 0000000000..fc5adee3ef
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulelist.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleList AWS CloudFormation Resource (AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulelist.html
+type ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleList struct {
+
+	// AllowedAdditionalAnalyses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulelist.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulelist-allowedadditionalanalyses
+	AllowedAdditionalAnalyses []string `json:"AllowedAdditionalAnalyses,omitempty"`
+
+	// AllowedResultReceivers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulelist.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulelist-allowedresultreceivers
+	AllowedResultReceivers []string `json:"AllowedResultReceivers,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 *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleList) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicy.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicy.go
new file mode 100644
index 0000000000..549ec163eb
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicy.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicy AWS CloudFormation Resource (AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicy.html
+type ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicy struct {
+
+	// V1 AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicy.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicy-v1
+	V1 *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicyV1 `json:"V1"`
+
+	// 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 *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicy) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicyv1.go b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicyv1.go
new file mode 100644
index 0000000000..d6a00fab71
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-configuredtableassociation_configuredtableassociationanalysisrulepolicyv1.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicyV1 AWS CloudFormation Resource (AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicyv1.html
+type ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicyV1 struct {
+
+	// Aggregation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicyv1.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicyv1-aggregation
+	Aggregation *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleAggregation `json:"Aggregation,omitempty"`
+
+	// Custom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicyv1.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicyv1-custom
+	Custom *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleCustom `json:"Custom,omitempty"`
+
+	// List AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicyv1.html#cfn-cleanrooms-configuredtableassociation-configuredtableassociationanalysisrulepolicyv1-list
+	List *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRuleList `json:"List,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 *ConfiguredTableAssociation_ConfiguredTableAssociationAnalysisRulePolicyV1) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable.go b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable.go
new file mode 100644
index 0000000000..d9ad1b7488
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable.go
@@ -0,0 +1,143 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// IdMappingTable AWS CloudFormation Resource (AWS::CleanRooms::IdMappingTable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html
+type IdMappingTable struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html#cfn-cleanrooms-idmappingtable-description
+	Description *string `json:"Description,omitempty"`
+
+	// InputReferenceConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html#cfn-cleanrooms-idmappingtable-inputreferenceconfig
+	InputReferenceConfig *IdMappingTable_IdMappingTableInputReferenceConfig `json:"InputReferenceConfig"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html#cfn-cleanrooms-idmappingtable-kmskeyarn
+	KmsKeyArn *string `json:"KmsKeyArn,omitempty"`
+
+	// MembershipIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html#cfn-cleanrooms-idmappingtable-membershipidentifier
+	MembershipIdentifier string `json:"MembershipIdentifier"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html#cfn-cleanrooms-idmappingtable-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idmappingtable.html#cfn-cleanrooms-idmappingtable-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 *IdMappingTable) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdMappingTable"
+}
+
+// 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 IdMappingTable) MarshalJSON() ([]byte, error) {
+	type Properties IdMappingTable
+	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 *IdMappingTable) UnmarshalJSON(b []byte) error {
+	type Properties IdMappingTable
+	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 = IdMappingTable(*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/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceconfig.go b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceconfig.go
new file mode 100644
index 0000000000..1662f27698
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdMappingTable_IdMappingTableInputReferenceConfig AWS CloudFormation Resource (AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputreferenceconfig.html
+type IdMappingTable_IdMappingTableInputReferenceConfig struct {
+
+	// InputReferenceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputreferenceconfig.html#cfn-cleanrooms-idmappingtable-idmappingtableinputreferenceconfig-inputreferencearn
+	InputReferenceArn string `json:"InputReferenceArn"`
+
+	// ManageResourcePolicies AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputreferenceconfig.html#cfn-cleanrooms-idmappingtable-idmappingtableinputreferenceconfig-manageresourcepolicies
+	ManageResourcePolicies bool `json:"ManageResourcePolicies"`
+
+	// 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 *IdMappingTable_IdMappingTableInputReferenceConfig) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceproperties.go b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceproperties.go
new file mode 100644
index 0000000000..92ef694538
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputreferenceproperties.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdMappingTable_IdMappingTableInputReferenceProperties AWS CloudFormation Resource (AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputreferenceproperties.html
+type IdMappingTable_IdMappingTableInputReferenceProperties struct {
+
+	// IdMappingTableInputSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputreferenceproperties.html#cfn-cleanrooms-idmappingtable-idmappingtableinputreferenceproperties-idmappingtableinputsource
+	IdMappingTableInputSource []IdMappingTable_IdMappingTableInputSource `json:"IdMappingTableInputSource"`
+
+	// 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 *IdMappingTable_IdMappingTableInputReferenceProperties) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputsource.go b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputsource.go
new file mode 100644
index 0000000000..fa41a94611
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idmappingtable_idmappingtableinputsource.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdMappingTable_IdMappingTableInputSource AWS CloudFormation Resource (AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputsource.html
+type IdMappingTable_IdMappingTableInputSource struct {
+
+	// IdNamespaceAssociationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputsource.html#cfn-cleanrooms-idmappingtable-idmappingtableinputsource-idnamespaceassociationid
+	IdNamespaceAssociationId string `json:"IdNamespaceAssociationId"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idmappingtable-idmappingtableinputsource.html#cfn-cleanrooms-idmappingtable-idmappingtableinputsource-type
+	Type string `json:"Type"`
+
+	// 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 *IdMappingTable_IdMappingTableInputSource) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation.go b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation.go
new file mode 100644
index 0000000000..01ffa040e8
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation.go
@@ -0,0 +1,143 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// IdNamespaceAssociation AWS CloudFormation Resource (AWS::CleanRooms::IdNamespaceAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html
+type IdNamespaceAssociation struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html#cfn-cleanrooms-idnamespaceassociation-description
+	Description *string `json:"Description,omitempty"`
+
+	// IdMappingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html#cfn-cleanrooms-idnamespaceassociation-idmappingconfig
+	IdMappingConfig *IdNamespaceAssociation_IdMappingConfig `json:"IdMappingConfig,omitempty"`
+
+	// InputReferenceConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html#cfn-cleanrooms-idnamespaceassociation-inputreferenceconfig
+	InputReferenceConfig *IdNamespaceAssociation_IdNamespaceAssociationInputReferenceConfig `json:"InputReferenceConfig"`
+
+	// MembershipIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html#cfn-cleanrooms-idnamespaceassociation-membershipidentifier
+	MembershipIdentifier string `json:"MembershipIdentifier"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html#cfn-cleanrooms-idnamespaceassociation-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cleanrooms-idnamespaceassociation.html#cfn-cleanrooms-idnamespaceassociation-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 *IdNamespaceAssociation) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdNamespaceAssociation"
+}
+
+// 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 IdNamespaceAssociation) MarshalJSON() ([]byte, error) {
+	type Properties IdNamespaceAssociation
+	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 *IdNamespaceAssociation) UnmarshalJSON(b []byte) error {
+	type Properties IdNamespaceAssociation
+	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 = IdNamespaceAssociation(*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/cleanrooms/aws-cleanrooms-idnamespaceassociation_idmappingconfig.go b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idmappingconfig.go
new file mode 100644
index 0000000000..b82db3043b
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idmappingconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdNamespaceAssociation_IdMappingConfig AWS CloudFormation Resource (AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idmappingconfig.html
+type IdNamespaceAssociation_IdMappingConfig struct {
+
+	// AllowUseAsDimensionColumn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idmappingconfig.html#cfn-cleanrooms-idnamespaceassociation-idmappingconfig-allowuseasdimensioncolumn
+	AllowUseAsDimensionColumn bool `json:"AllowUseAsDimensionColumn"`
+
+	// 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 *IdNamespaceAssociation_IdMappingConfig) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceconfig.go b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceconfig.go
new file mode 100644
index 0000000000..c7d486a270
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdNamespaceAssociation_IdNamespaceAssociationInputReferenceConfig AWS CloudFormation Resource (AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceconfig.html
+type IdNamespaceAssociation_IdNamespaceAssociationInputReferenceConfig struct {
+
+	// InputReferenceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceconfig.html#cfn-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceconfig-inputreferencearn
+	InputReferenceArn string `json:"InputReferenceArn"`
+
+	// ManageResourcePolicies AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceconfig.html#cfn-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceconfig-manageresourcepolicies
+	ManageResourcePolicies bool `json:"ManageResourcePolicies"`
+
+	// 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 *IdNamespaceAssociation_IdNamespaceAssociationInputReferenceConfig) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig"
+}
diff --git a/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceproperties.go b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceproperties.go
new file mode 100644
index 0000000000..4677e6087f
--- /dev/null
+++ b/cloudformation/cleanrooms/aws-cleanrooms-idnamespaceassociation_idnamespaceassociationinputreferenceproperties.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cleanrooms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdNamespaceAssociation_IdNamespaceAssociationInputReferenceProperties AWS CloudFormation Resource (AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceproperties.html
+type IdNamespaceAssociation_IdNamespaceAssociationInputReferenceProperties struct {
+
+	// IdMappingWorkflowsSupported AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceproperties.html#cfn-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceproperties-idmappingworkflowssupported
+	IdMappingWorkflowsSupported []interface{} `json:"IdMappingWorkflowsSupported,omitempty"`
+
+	// IdNamespaceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceproperties.html#cfn-cleanrooms-idnamespaceassociation-idnamespaceassociationinputreferenceproperties-idnamespacetype
+	IdNamespaceType *string `json:"IdNamespaceType,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 *IdNamespaceAssociation_IdNamespaceAssociationInputReferenceProperties) AWSCloudFormationType() string {
+	return "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties"
+}
diff --git a/cloudformation/cloudformation/aws-cloudformation-customresource.go b/cloudformation/cloudformation/aws-cloudformation-customresource.go
index b0a5fb7f89..d85b11ceeb 100644
--- a/cloudformation/cloudformation/aws-cloudformation-customresource.go
+++ b/cloudformation/cloudformation/aws-cloudformation-customresource.go
@@ -13,6 +13,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html
 type CustomResource struct {
 
+	// ServiceTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html#cfn-customresource-servicetimeout
+	ServiceTimeout *int `json:"ServiceTimeout,omitempty"`
+
 	// ServiceToken AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html#cfn-customresource-servicetoken
diff --git a/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go b/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
index a9636b2771..3696c52e1d 100644
--- a/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
+++ b/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html
 type StackSet_OperationPreferences struct {
 
+	// ConcurrencyMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html#cfn-cloudformation-stackset-operationpreferences-concurrencymode
+	ConcurrencyMode *string `json:"ConcurrencyMode,omitempty"`
+
 	// FailureToleranceCount AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html#cfn-cloudformation-stackset-operationpreferences-failuretolerancecount
diff --git a/cloudformation/codebuild/aws-codebuild-fleet.go b/cloudformation/codebuild/aws-codebuild-fleet.go
index 1d9270daa6..e2dc7ac8b4 100644
--- a/cloudformation/codebuild/aws-codebuild-fleet.go
+++ b/cloudformation/codebuild/aws-codebuild-fleet.go
@@ -29,11 +29,31 @@ type Fleet struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html#cfn-codebuild-fleet-environmenttype
 	EnvironmentType *string `json:"EnvironmentType,omitempty"`
 
+	// FleetServiceRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html#cfn-codebuild-fleet-fleetservicerole
+	FleetServiceRole *string `json:"FleetServiceRole,omitempty"`
+
+	// FleetVpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html#cfn-codebuild-fleet-fleetvpcconfig
+	FleetVpcConfig *Fleet_VpcConfig `json:"FleetVpcConfig,omitempty"`
+
+	// ImageId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html#cfn-codebuild-fleet-imageid
+	ImageId *string `json:"ImageId,omitempty"`
+
 	// Name AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html#cfn-codebuild-fleet-name
 	Name *string `json:"Name,omitempty"`
 
+	// OverflowBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html#cfn-codebuild-fleet-overflowbehavior
+	OverflowBehavior *string `json:"OverflowBehavior,omitempty"`
+
 	// Tags AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-fleet.html#cfn-codebuild-fleet-tags
diff --git a/cloudformation/codebuild/aws-codebuild-fleet_vpcconfig.go b/cloudformation/codebuild/aws-codebuild-fleet_vpcconfig.go
new file mode 100644
index 0000000000..6f1ab5d2ad
--- /dev/null
+++ b/cloudformation/codebuild/aws-codebuild-fleet_vpcconfig.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codebuild
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Fleet_VpcConfig AWS CloudFormation Resource (AWS::CodeBuild::Fleet.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-fleet-vpcconfig.html
+type Fleet_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-fleet-vpcconfig.html#cfn-codebuild-fleet-vpcconfig-securitygroupids
+	SecurityGroupIds []string `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-fleet-vpcconfig.html#cfn-codebuild-fleet-vpcconfig-subnets
+	Subnets []string `json:"Subnets,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-fleet-vpcconfig.html#cfn-codebuild-fleet-vpcconfig-vpcid
+	VpcId *string `json:"VpcId,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 *Fleet_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Fleet.VpcConfig"
+}
diff --git a/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go b/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
index a556cf85b5..1459f2acb5 100644
--- a/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
+++ b/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
@@ -20,6 +20,11 @@ type Project_ProjectTriggers struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projecttriggers.html#cfn-codebuild-project-projecttriggers-filtergroups
 	FilterGroups []Project_FilterGroup `json:"FilterGroups,omitempty"`
 
+	// ScopeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projecttriggers.html#cfn-codebuild-project-projecttriggers-scopeconfiguration
+	ScopeConfiguration *Project_ScopeConfiguration `json:"ScopeConfiguration,omitempty"`
+
 	// Webhook AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projecttriggers.html#cfn-codebuild-project-projecttriggers-webhook
diff --git a/cloudformation/codebuild/aws-codebuild-project_scopeconfiguration.go b/cloudformation/codebuild/aws-codebuild-project_scopeconfiguration.go
new file mode 100644
index 0000000000..157308a3ed
--- /dev/null
+++ b/cloudformation/codebuild/aws-codebuild-project_scopeconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codebuild
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Project_ScopeConfiguration AWS CloudFormation Resource (AWS::CodeBuild::Project.ScopeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-scopeconfiguration.html
+type Project_ScopeConfiguration struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-scopeconfiguration.html#cfn-codebuild-project-scopeconfiguration-name
+	Name string `json:"Name"`
+
+	// 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 *Project_ScopeConfiguration) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.ScopeConfiguration"
+}
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
index c1564cfd93..8cd0455bf1 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
@@ -7,57 +7,57 @@ import (
 )
 
 // Pipeline_ActionDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ActionDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html
 type Pipeline_ActionDeclaration struct {
 
 	// ActionTypeId AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-actiontypeid
 	ActionTypeId *Pipeline_ActionTypeId `json:"ActionTypeId"`
 
 	// Configuration AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-configuration
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-configuration
 	Configuration interface{} `json:"Configuration,omitempty"`
 
 	// InputArtifacts AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-inputartifacts
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-inputartifacts
 	InputArtifacts []Pipeline_InputArtifact `json:"InputArtifacts,omitempty"`
 
 	// Name AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-name
 	Name string `json:"Name"`
 
 	// Namespace AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-actiondeclaration-namespace
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-namespace
 	Namespace *string `json:"Namespace,omitempty"`
 
 	// OutputArtifacts AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-outputartifacts
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-outputartifacts
 	OutputArtifacts []Pipeline_OutputArtifact `json:"OutputArtifacts,omitempty"`
 
 	// Region AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-region
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-region
 	Region *string `json:"Region,omitempty"`
 
 	// RoleArn AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-rolearn
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-rolearn
 	RoleArn *string `json:"RoleArn,omitempty"`
 
 	// RunOrder AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-stages-actions-runorder
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-runorder
 	RunOrder *int `json:"RunOrder,omitempty"`
 
 	// TimeoutInMinutes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions.html#cfn-codepipeline-pipeline-actiondeclaration-timeoutinminutes
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiondeclaration.html#cfn-codepipeline-pipeline-actiondeclaration-timeoutinminutes
 	TimeoutInMinutes *int `json:"TimeoutInMinutes,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
index 32c2422555..1c10274f75 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
@@ -7,27 +7,27 @@ import (
 )
 
 // Pipeline_ActionTypeId AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ActionTypeId)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiontypeid.html
 type Pipeline_ActionTypeId struct {
 
 	// Category AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-category
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiontypeid.html#cfn-codepipeline-pipeline-actiontypeid-category
 	Category string `json:"Category"`
 
 	// Owner AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-owner
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiontypeid.html#cfn-codepipeline-pipeline-actiontypeid-owner
 	Owner string `json:"Owner"`
 
 	// Provider AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-provider
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiontypeid.html#cfn-codepipeline-pipeline-actiontypeid-provider
 	Provider string `json:"Provider"`
 
 	// Version AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-actiontypeid.html#cfn-codepipeline-pipeline-stages-actions-actiontypeid-version
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-actiontypeid.html#cfn-codepipeline-pipeline-actiontypeid-version
 	Version string `json:"Version"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_beforeentryconditions.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_beforeentryconditions.go
new file mode 100644
index 0000000000..7619d72b57
--- /dev/null
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_beforeentryconditions.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codepipeline
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipeline_BeforeEntryConditions AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.BeforeEntryConditions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-beforeentryconditions.html
+type Pipeline_BeforeEntryConditions struct {
+
+	// Conditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-beforeentryconditions.html#cfn-codepipeline-pipeline-beforeentryconditions-conditions
+	Conditions []Pipeline_Condition `json:"Conditions,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 *Pipeline_BeforeEntryConditions) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.BeforeEntryConditions"
+}
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
index 526339d7b2..471b96a0ef 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Pipeline_BlockerDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.BlockerDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-blockers.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-blockerdeclaration.html
 type Pipeline_BlockerDeclaration struct {
 
 	// Name AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-blockers.html#cfn-codepipeline-pipeline-stages-blockers-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-blockerdeclaration.html#cfn-codepipeline-pipeline-blockerdeclaration-name
 	Name string `json:"Name"`
 
 	// Type AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-blockers.html#cfn-codepipeline-pipeline-stages-blockers-type
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-blockerdeclaration.html#cfn-codepipeline-pipeline-blockerdeclaration-type
 	Type string `json:"Type"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_condition.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_condition.go
new file mode 100644
index 0000000000..6f9bbb85dd
--- /dev/null
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_condition.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codepipeline
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipeline_Condition AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.Condition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-condition.html
+type Pipeline_Condition struct {
+
+	// Result AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-condition.html#cfn-codepipeline-pipeline-condition-result
+	Result *string `json:"Result,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-condition.html#cfn-codepipeline-pipeline-condition-rules
+	Rules []Pipeline_RuleDeclaration `json:"Rules,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 *Pipeline_Condition) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.Condition"
+}
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
index 6f518fbbd3..5cbf2e2322 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Pipeline_EncryptionKey AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.EncryptionKey)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore-encryptionkey.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-encryptionkey.html
 type Pipeline_EncryptionKey struct {
 
 	// Id AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore-encryptionkey.html#cfn-codepipeline-pipeline-artifactstore-encryptionkey-id
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-encryptionkey.html#cfn-codepipeline-pipeline-encryptionkey-id
 	Id string `json:"Id"`
 
 	// Type AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore-encryptionkey.html#cfn-codepipeline-pipeline-artifactstore-encryptionkey-type
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-encryptionkey.html#cfn-codepipeline-pipeline-encryptionkey-type
 	Type string `json:"Type"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_failureconditions.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_failureconditions.go
new file mode 100644
index 0000000000..2a8a42564b
--- /dev/null
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_failureconditions.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codepipeline
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipeline_FailureConditions AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.FailureConditions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-failureconditions.html
+type Pipeline_FailureConditions struct {
+
+	// Conditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-failureconditions.html#cfn-codepipeline-pipeline-failureconditions-conditions
+	Conditions []Pipeline_Condition `json:"Conditions,omitempty"`
+
+	// Result AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-failureconditions.html#cfn-codepipeline-pipeline-failureconditions-result
+	Result *string `json:"Result,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 *Pipeline_FailureConditions) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.FailureConditions"
+}
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitbranchfiltercriteria.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitbranchfiltercriteria.go
index 9948f2808e..d05fb0c4f2 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitbranchfiltercriteria.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitbranchfiltercriteria.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Pipeline_GitBranchFilterCriteria AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.GitBranchFilterCriteria)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-branch-filter-criteria.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitbranchfiltercriteria.html
 type Pipeline_GitBranchFilterCriteria struct {
 
 	// Excludes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-branch-filter-criteria.html#aws-properties-codepipeline-pipeline-triggers-git-push-branch-pattern
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitbranchfiltercriteria.html#cfn-codepipeline-pipeline-gitbranchfiltercriteria-excludes
 	Excludes []string `json:"Excludes,omitempty"`
 
 	// Includes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-branch-filter-criteria.html#aws-properties-codepipeline-pipeline-triggers-git-push-branch-pattern
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitbranchfiltercriteria.html#cfn-codepipeline-pipeline-gitbranchfiltercriteria-includes
 	Includes []string `json:"Includes,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitconfiguration.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitconfiguration.go
index f4bebac9f5..bd2db939ab 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitconfiguration.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitconfiguration.go
@@ -7,22 +7,22 @@ import (
 )
 
 // Pipeline_GitConfiguration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.GitConfiguration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-configuration.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitconfiguration.html
 type Pipeline_GitConfiguration struct {
 
 	// PullRequest AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-configuration.html#aws-properties-codepipeline-pipeline-triggers-git-configuration-pull-request
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitconfiguration.html#cfn-codepipeline-pipeline-gitconfiguration-pullrequest
 	PullRequest []Pipeline_GitPullRequestFilter `json:"PullRequest,omitempty"`
 
 	// Push AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-configuration.html#aws-properties-codepipeline-pipeline-triggers-git-configuration-push
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitconfiguration.html#cfn-codepipeline-pipeline-gitconfiguration-push
 	Push []Pipeline_GitPushFilter `json:"Push,omitempty"`
 
 	// SourceActionName AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-configuration.html#aws-properties-codepipeline-pipeline-triggers-git-configuration-source-action-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitconfiguration.html#cfn-codepipeline-pipeline-gitconfiguration-sourceactionname
 	SourceActionName string `json:"SourceActionName"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitfilepathfiltercriteria.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitfilepathfiltercriteria.go
index b7c2a7b8c0..96fd74e807 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitfilepathfiltercriteria.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitfilepathfiltercriteria.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Pipeline_GitFilePathFilterCriteria AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.GitFilePathFilterCriteria)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-file-path-filter-criteria.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitfilepathfiltercriteria.html
 type Pipeline_GitFilePathFilterCriteria struct {
 
 	// Excludes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-file-path-filter-criteria.html#aws-properties-codepipeline-pipeline-triggers-git-file-path-pattern
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitfilepathfiltercriteria.html#cfn-codepipeline-pipeline-gitfilepathfiltercriteria-excludes
 	Excludes []string `json:"Excludes,omitempty"`
 
 	// Includes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-file-path-filter-criteria.html#aws-properties-codepipeline-pipeline-triggers-git-file-path-pattern
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitfilepathfiltercriteria.html#cfn-codepipeline-pipeline-gitfilepathfiltercriteria-includes
 	Includes []string `json:"Includes,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpullrequestfilter.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpullrequestfilter.go
index 32dc3f6d39..330a8f6fd9 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpullrequestfilter.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpullrequestfilter.go
@@ -7,22 +7,22 @@ import (
 )
 
 // Pipeline_GitPullRequestFilter AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.GitPullRequestFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-pull-request-filter.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpullrequestfilter.html
 type Pipeline_GitPullRequestFilter struct {
 
 	// Branches AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-pull-request-filter.html#aws-properties-codepipeline-pipeline-triggers-git-branch-filter-criteria
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpullrequestfilter.html#cfn-codepipeline-pipeline-gitpullrequestfilter-branches
 	Branches *Pipeline_GitBranchFilterCriteria `json:"Branches,omitempty"`
 
 	// Events AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-pull-request-filter.html#aws-properties-codepipeline-pipeline-triggers-git-pull-request-event-filter-criteria
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpullrequestfilter.html#cfn-codepipeline-pipeline-gitpullrequestfilter-events
 	Events []string `json:"Events,omitempty"`
 
 	// FilePaths AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-pull-request-filter.html#aws-properties-codepipeline-pipeline-triggers-git-file-path-filter-criteria
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpullrequestfilter.html#cfn-codepipeline-pipeline-gitpullrequestfilter-filepaths
 	FilePaths *Pipeline_GitFilePathFilterCriteria `json:"FilePaths,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpushfilter.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpushfilter.go
index b52eb2d55e..e66f940cae 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpushfilter.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_gitpushfilter.go
@@ -7,22 +7,22 @@ import (
 )
 
 // Pipeline_GitPushFilter AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.GitPushFilter)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-push-filter.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpushfilter.html
 type Pipeline_GitPushFilter struct {
 
 	// Branches AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-push-filter.html#aws-properties-codepipeline-pipeline-triggers-git-branch-filter-criteria
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpushfilter.html#cfn-codepipeline-pipeline-gitpushfilter-branches
 	Branches *Pipeline_GitBranchFilterCriteria `json:"Branches,omitempty"`
 
 	// FilePaths AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-push-filter.html#aws-properties-codepipeline-pipeline-triggers-git-file-path-filter-criteria
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpushfilter.html#cfn-codepipeline-pipeline-gitpushfilter-filepaths
 	FilePaths *Pipeline_GitFilePathFilterCriteria `json:"FilePaths,omitempty"`
 
 	// Tags AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-push-filter.html#aws-properties-codepipeline-pipeline-triggers-git-tag-filter-criteria
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gitpushfilter.html#cfn-codepipeline-pipeline-gitpushfilter-tags
 	Tags *Pipeline_GitTagFilterCriteria `json:"Tags,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_gittagfiltercriteria.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_gittagfiltercriteria.go
index f689257e3b..4e743915c4 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_gittagfiltercriteria.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_gittagfiltercriteria.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Pipeline_GitTagFilterCriteria AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.GitTagFilterCriteria)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-tag-filter-criteria.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gittagfiltercriteria.html
 type Pipeline_GitTagFilterCriteria struct {
 
 	// Excludes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-tag-filter-criteria.html#aws-properties-codepipeline-pipeline-triggers-git-tag-pattern
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gittagfiltercriteria.html#cfn-codepipeline-pipeline-gittagfiltercriteria-excludes
 	Excludes []string `json:"Excludes,omitempty"`
 
 	// Includes AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers-git-tag-filter-criteria.html#aws-properties-codepipeline-pipeline-triggers-git-tag-pattern
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-gittagfiltercriteria.html#cfn-codepipeline-pipeline-gittagfiltercriteria-includes
 	Includes []string `json:"Includes,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
index d281fa9f6d..6e495e3570 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
@@ -7,12 +7,12 @@ import (
 )
 
 // Pipeline_InputArtifact AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.InputArtifact)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-inputartifacts.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-inputartifact.html
 type Pipeline_InputArtifact struct {
 
 	// Name AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-inputartifacts.html#cfn-codepipeline-pipeline-stages-actions-inputartifacts-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-inputartifact.html#cfn-codepipeline-pipeline-inputartifact-name
 	Name string `json:"Name"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
index 510c603702..c1c3cf6379 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
@@ -7,12 +7,12 @@ import (
 )
 
 // Pipeline_OutputArtifact AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.OutputArtifact)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-outputartifacts.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-outputartifact.html
 type Pipeline_OutputArtifact struct {
 
 	// Name AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages-actions-outputartifacts.html#cfn-codepipeline-pipeline-stages-actions-outputartifacts-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-outputartifact.html#cfn-codepipeline-pipeline-outputartifact-name
 	Name string `json:"Name"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_pipelinetriggerdeclaration.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_pipelinetriggerdeclaration.go
index b126ea777f..ed93e4399e 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_pipelinetriggerdeclaration.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_pipelinetriggerdeclaration.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Pipeline_PipelineTriggerDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.PipelineTriggerDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-pipelinetriggerdeclaration.html
 type Pipeline_PipelineTriggerDeclaration struct {
 
 	// GitConfiguration AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers.html#cfn-codepipeline-pipeline-triggers-git-configuration
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-pipelinetriggerdeclaration.html#cfn-codepipeline-pipeline-pipelinetriggerdeclaration-gitconfiguration
 	GitConfiguration *Pipeline_GitConfiguration `json:"GitConfiguration,omitempty"`
 
 	// ProviderType AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-triggers.html#cfn-codepipeline-pipeline-triggers-provider-type
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-pipelinetriggerdeclaration.html#cfn-codepipeline-pipeline-pipelinetriggerdeclaration-providertype
 	ProviderType string `json:"ProviderType"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_ruledeclaration.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_ruledeclaration.go
new file mode 100644
index 0000000000..debbfe21d6
--- /dev/null
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_ruledeclaration.go
@@ -0,0 +1,62 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codepipeline
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipeline_RuleDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.RuleDeclaration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruledeclaration.html
+type Pipeline_RuleDeclaration struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruledeclaration.html#cfn-codepipeline-pipeline-ruledeclaration-configuration
+	Configuration interface{} `json:"Configuration,omitempty"`
+
+	// InputArtifacts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruledeclaration.html#cfn-codepipeline-pipeline-ruledeclaration-inputartifacts
+	InputArtifacts []Pipeline_InputArtifact `json:"InputArtifacts,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruledeclaration.html#cfn-codepipeline-pipeline-ruledeclaration-name
+	Name *string `json:"Name,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruledeclaration.html#cfn-codepipeline-pipeline-ruledeclaration-region
+	Region *string `json:"Region,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruledeclaration.html#cfn-codepipeline-pipeline-ruledeclaration-rolearn
+	RoleArn *string `json:"RoleArn,omitempty"`
+
+	// RuleTypeId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruledeclaration.html#cfn-codepipeline-pipeline-ruledeclaration-ruletypeid
+	RuleTypeId *Pipeline_RuleTypeId `json:"RuleTypeId,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 *Pipeline_RuleDeclaration) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.RuleDeclaration"
+}
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_ruletypeid.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_ruletypeid.go
new file mode 100644
index 0000000000..971d95be4b
--- /dev/null
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_ruletypeid.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codepipeline
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipeline_RuleTypeId AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.RuleTypeId)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruletypeid.html
+type Pipeline_RuleTypeId struct {
+
+	// Category AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruletypeid.html#cfn-codepipeline-pipeline-ruletypeid-category
+	Category *string `json:"Category,omitempty"`
+
+	// Owner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruletypeid.html#cfn-codepipeline-pipeline-ruletypeid-owner
+	Owner *string `json:"Owner,omitempty"`
+
+	// Provider AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruletypeid.html#cfn-codepipeline-pipeline-ruletypeid-provider
+	Provider *string `json:"Provider,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-ruletypeid.html#cfn-codepipeline-pipeline-ruletypeid-version
+	Version *string `json:"Version,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 *Pipeline_RuleTypeId) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.RuleTypeId"
+}
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
index 7f7d76b8fb..f89494ed1a 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
@@ -7,24 +7,39 @@ import (
 )
 
 // Pipeline_StageDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html
 type Pipeline_StageDeclaration struct {
 
 	// Actions AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html#cfn-codepipeline-pipeline-stages-actions
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html#cfn-codepipeline-pipeline-stagedeclaration-actions
 	Actions []Pipeline_ActionDeclaration `json:"Actions"`
 
+	// BeforeEntry AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html#cfn-codepipeline-pipeline-stagedeclaration-beforeentry
+	BeforeEntry *Pipeline_BeforeEntryConditions `json:"BeforeEntry,omitempty"`
+
 	// Blockers AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html#cfn-codepipeline-pipeline-stages-blockers
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html#cfn-codepipeline-pipeline-stagedeclaration-blockers
 	Blockers []Pipeline_BlockerDeclaration `json:"Blockers,omitempty"`
 
 	// Name AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.html#cfn-codepipeline-pipeline-stages-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html#cfn-codepipeline-pipeline-stagedeclaration-name
 	Name string `json:"Name"`
 
+	// OnFailure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html#cfn-codepipeline-pipeline-stagedeclaration-onfailure
+	OnFailure *Pipeline_FailureConditions `json:"OnFailure,omitempty"`
+
+	// OnSuccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagedeclaration.html#cfn-codepipeline-pipeline-stagedeclaration-onsuccess
+	OnSuccess *Pipeline_SuccessConditions `json:"OnSuccess,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
index 78c31d3c40..916c5e1673 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Pipeline_StageTransition AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageTransition)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagetransition.html
 type Pipeline_StageTransition struct {
 
 	// Reason AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.html#cfn-codepipeline-pipeline-disableinboundstagetransitions-reason
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagetransition.html#cfn-codepipeline-pipeline-stagetransition-reason
 	Reason string `json:"Reason"`
 
 	// StageName AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.html#cfn-codepipeline-pipeline-disableinboundstagetransitions-stagename
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stagetransition.html#cfn-codepipeline-pipeline-stagetransition-stagename
 	StageName string `json:"StageName"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_successconditions.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_successconditions.go
new file mode 100644
index 0000000000..1117038b94
--- /dev/null
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_successconditions.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package codepipeline
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipeline_SuccessConditions AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.SuccessConditions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-successconditions.html
+type Pipeline_SuccessConditions struct {
+
+	// Conditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-successconditions.html#cfn-codepipeline-pipeline-successconditions-conditions
+	Conditions []Pipeline_Condition `json:"Conditions,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 *Pipeline_SuccessConditions) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.SuccessConditions"
+}
diff --git a/cloudformation/codepipeline/aws-codepipeline-pipeline_variabledeclaration.go b/cloudformation/codepipeline/aws-codepipeline-pipeline_variabledeclaration.go
index 2a487cac83..c303c77dca 100644
--- a/cloudformation/codepipeline/aws-codepipeline-pipeline_variabledeclaration.go
+++ b/cloudformation/codepipeline/aws-codepipeline-pipeline_variabledeclaration.go
@@ -7,22 +7,22 @@ import (
 )
 
 // Pipeline_VariableDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.VariableDeclaration)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variables.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variabledeclaration.html
 type Pipeline_VariableDeclaration struct {
 
 	// DefaultValue AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variables.html#cfn-codepipeline-pipeline-variables-value
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variabledeclaration.html#cfn-codepipeline-pipeline-variabledeclaration-defaultvalue
 	DefaultValue *string `json:"DefaultValue,omitempty"`
 
 	// Description AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variables.html#cfn-codepipeline-pipeline-variables-description
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variabledeclaration.html#cfn-codepipeline-pipeline-variabledeclaration-description
 	Description *string `json:"Description,omitempty"`
 
 	// Name AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variables.html#cfn-codepipeline-pipeline-variables-name
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-variabledeclaration.html#cfn-codepipeline-pipeline-variabledeclaration-name
 	Name string `json:"Name"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/cognito/aws-cognito-identitypool.go b/cloudformation/cognito/aws-cognito-identitypool.go
index 0698326433..534bc387a6 100644
--- a/cloudformation/cognito/aws-cognito-identitypool.go
+++ b/cloudformation/cognito/aws-cognito-identitypool.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // IdentityPool AWS CloudFormation Resource (AWS::Cognito::IdentityPool)
@@ -48,6 +49,11 @@ type IdentityPool struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-identitypoolname
 	IdentityPoolName *string `json:"IdentityPoolName,omitempty"`
 
+	// IdentityPoolTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-identitypooltags
+	IdentityPoolTags []tags.Tag `json:"IdentityPoolTags,omitempty"`
+
 	// OpenIdConnectProviderARNs AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-openidconnectproviderarns
diff --git a/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_firehoseconfiguration.go b/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_firehoseconfiguration.go
new file mode 100644
index 0000000000..5f9b7d8a7c
--- /dev/null
+++ b/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_firehoseconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cognito
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// LogDeliveryConfiguration_FirehoseConfiguration AWS CloudFormation Resource (AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-firehoseconfiguration.html
+type LogDeliveryConfiguration_FirehoseConfiguration struct {
+
+	// StreamArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-firehoseconfiguration.html#cfn-cognito-logdeliveryconfiguration-firehoseconfiguration-streamarn
+	StreamArn *string `json:"StreamArn,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 *LogDeliveryConfiguration_FirehoseConfiguration) AWSCloudFormationType() string {
+	return "AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration"
+}
diff --git a/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_logconfiguration.go b/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_logconfiguration.go
index f75e3b1685..744ca4f258 100644
--- a/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_logconfiguration.go
+++ b/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_logconfiguration.go
@@ -20,11 +20,21 @@ type LogDeliveryConfiguration_LogConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-logconfiguration.html#cfn-cognito-logdeliveryconfiguration-logconfiguration-eventsource
 	EventSource *string `json:"EventSource,omitempty"`
 
+	// FirehoseConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-logconfiguration.html#cfn-cognito-logdeliveryconfiguration-logconfiguration-firehoseconfiguration
+	FirehoseConfiguration *LogDeliveryConfiguration_FirehoseConfiguration `json:"FirehoseConfiguration,omitempty"`
+
 	// LogLevel AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-logconfiguration.html#cfn-cognito-logdeliveryconfiguration-logconfiguration-loglevel
 	LogLevel *string `json:"LogLevel,omitempty"`
 
+	// S3Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-logconfiguration.html#cfn-cognito-logdeliveryconfiguration-logconfiguration-s3configuration
+	S3Configuration *LogDeliveryConfiguration_S3Configuration `json:"S3Configuration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_s3configuration.go b/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_s3configuration.go
new file mode 100644
index 0000000000..5fb2a7276b
--- /dev/null
+++ b/cloudformation/cognito/aws-cognito-logdeliveryconfiguration_s3configuration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cognito
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// LogDeliveryConfiguration_S3Configuration AWS CloudFormation Resource (AWS::Cognito::LogDeliveryConfiguration.S3Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-s3configuration.html
+type LogDeliveryConfiguration_S3Configuration struct {
+
+	// BucketArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-logdeliveryconfiguration-s3configuration.html#cfn-cognito-logdeliveryconfiguration-s3configuration-bucketarn
+	BucketArn *string `json:"BucketArn,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 *LogDeliveryConfiguration_S3Configuration) AWSCloudFormationType() string {
+	return "AWS::Cognito::LogDeliveryConfiguration.S3Configuration"
+}
diff --git a/cloudformation/cognito/aws-cognito-userpool.go b/cloudformation/cognito/aws-cognito-userpool.go
index d7ccb7d2f5..ecbbcfe81f 100644
--- a/cloudformation/cognito/aws-cognito-userpool.go
+++ b/cloudformation/cognito/aws-cognito-userpool.go
@@ -43,6 +43,16 @@ type UserPool struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-deviceconfiguration
 	DeviceConfiguration *UserPool_DeviceConfiguration `json:"DeviceConfiguration,omitempty"`
 
+	// EmailAuthenticationMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailauthenticationmessage
+	EmailAuthenticationMessage *string `json:"EmailAuthenticationMessage,omitempty"`
+
+	// EmailAuthenticationSubject AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailauthenticationsubject
+	EmailAuthenticationSubject *string `json:"EmailAuthenticationSubject,omitempty"`
+
 	// EmailConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailconfiguration
diff --git a/cloudformation/cognito/aws-cognito-userpool_advancedsecurityadditionalflows.go b/cloudformation/cognito/aws-cognito-userpool_advancedsecurityadditionalflows.go
new file mode 100644
index 0000000000..aa18a089f1
--- /dev/null
+++ b/cloudformation/cognito/aws-cognito-userpool_advancedsecurityadditionalflows.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package cognito
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserPool_AdvancedSecurityAdditionalFlows AWS CloudFormation Resource (AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-advancedsecurityadditionalflows.html
+type UserPool_AdvancedSecurityAdditionalFlows struct {
+
+	// CustomAuthMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-advancedsecurityadditionalflows.html#cfn-cognito-userpool-advancedsecurityadditionalflows-customauthmode
+	CustomAuthMode *string `json:"CustomAuthMode,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 *UserPool_AdvancedSecurityAdditionalFlows) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows"
+}
diff --git a/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go b/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
index babf35135f..6262e929b1 100644
--- a/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
+++ b/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
@@ -15,6 +15,11 @@ type UserPool_PasswordPolicy struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-minimumlength
 	MinimumLength *int `json:"MinimumLength,omitempty"`
 
+	// PasswordHistorySize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-passwordhistorysize
+	PasswordHistorySize *int `json:"PasswordHistorySize,omitempty"`
+
 	// RequireLowercase AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requirelowercase
diff --git a/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go b/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
index 62bf3a860f..31705eef25 100644
--- a/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
+++ b/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-userpooladdons.html
 type UserPool_UserPoolAddOns struct {
 
+	// AdvancedSecurityAdditionalFlows AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-userpooladdons.html#cfn-cognito-userpool-userpooladdons-advancedsecurityadditionalflows
+	AdvancedSecurityAdditionalFlows *UserPool_AdvancedSecurityAdditionalFlows `json:"AdvancedSecurityAdditionalFlows,omitempty"`
+
 	// AdvancedSecurityMode AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-userpooladdons.html#cfn-cognito-userpool-userpooladdons-advancedsecuritymode
diff --git a/cloudformation/connect/aws-connect-agentstatus.go b/cloudformation/connect/aws-connect-agentstatus.go
new file mode 100644
index 0000000000..049a410293
--- /dev/null
+++ b/cloudformation/connect/aws-connect-agentstatus.go
@@ -0,0 +1,153 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// AgentStatus AWS CloudFormation Resource (AWS::Connect::AgentStatus)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html
+type AgentStatus struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-description
+	Description *string `json:"Description,omitempty"`
+
+	// DisplayOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-displayorder
+	DisplayOrder *int `json:"DisplayOrder,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-instancearn
+	InstanceArn string `json:"InstanceArn"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-name
+	Name string `json:"Name"`
+
+	// ResetOrderNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-resetordernumber
+	ResetOrderNumber *bool `json:"ResetOrderNumber,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-state
+	State string `json:"State"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-agentstatus.html#cfn-connect-agentstatus-type
+	Type *string `json:"Type,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 *AgentStatus) AWSCloudFormationType() string {
+	return "AWS::Connect::AgentStatus"
+}
+
+// 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 AgentStatus) MarshalJSON() ([]byte, error) {
+	type Properties AgentStatus
+	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 *AgentStatus) UnmarshalJSON(b []byte) error {
+	type Properties AgentStatus
+	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 = AgentStatus(*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/connect/aws-connect-rule_actions.go b/cloudformation/connect/aws-connect-rule_actions.go
index 107aebc359..69bd1ff3b5 100644
--- a/cloudformation/connect/aws-connect-rule_actions.go
+++ b/cloudformation/connect/aws-connect-rule_actions.go
@@ -35,6 +35,11 @@ type Rule_Actions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-rule-actions.html#cfn-connect-rule-actions-sendnotificationactions
 	SendNotificationActions []Rule_SendNotificationAction `json:"SendNotificationActions,omitempty"`
 
+	// SubmitAutoEvaluationActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-rule-actions.html#cfn-connect-rule-actions-submitautoevaluationactions
+	SubmitAutoEvaluationActions []Rule_SubmitAutoEvaluationAction `json:"SubmitAutoEvaluationActions,omitempty"`
+
 	// TaskActions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-rule-actions.html#cfn-connect-rule-actions-taskactions
diff --git a/cloudformation/connect/aws-connect-rule_submitautoevaluationaction.go b/cloudformation/connect/aws-connect-rule_submitautoevaluationaction.go
new file mode 100644
index 0000000000..fbf54fa40b
--- /dev/null
+++ b/cloudformation/connect/aws-connect-rule_submitautoevaluationaction.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Rule_SubmitAutoEvaluationAction AWS CloudFormation Resource (AWS::Connect::Rule.SubmitAutoEvaluationAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-rule-submitautoevaluationaction.html
+type Rule_SubmitAutoEvaluationAction struct {
+
+	// EvaluationFormArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-rule-submitautoevaluationaction.html#cfn-connect-rule-submitautoevaluationaction-evaluationformarn
+	EvaluationFormArn string `json:"EvaluationFormArn"`
+
+	// 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 *Rule_SubmitAutoEvaluationAction) AWSCloudFormationType() string {
+	return "AWS::Connect::Rule.SubmitAutoEvaluationAction"
+}
diff --git a/cloudformation/connect/aws-connect-userhierarchystructure.go b/cloudformation/connect/aws-connect-userhierarchystructure.go
new file mode 100644
index 0000000000..bd601ae915
--- /dev/null
+++ b/cloudformation/connect/aws-connect-userhierarchystructure.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserHierarchyStructure AWS CloudFormation Resource (AWS::Connect::UserHierarchyStructure)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchystructure.html
+type UserHierarchyStructure struct {
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchystructure.html#cfn-connect-userhierarchystructure-instancearn
+	InstanceArn string `json:"InstanceArn"`
+
+	// UserHierarchyStructure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchystructure.html#cfn-connect-userhierarchystructure-userhierarchystructure
+	UserHierarchyStructure *UserHierarchyStructure_UserHierarchyStructure `json:"UserHierarchyStructure,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 *UserHierarchyStructure) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyStructure"
+}
+
+// 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 UserHierarchyStructure) MarshalJSON() ([]byte, error) {
+	type Properties UserHierarchyStructure
+	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 *UserHierarchyStructure) UnmarshalJSON(b []byte) error {
+	type Properties UserHierarchyStructure
+	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 = UserHierarchyStructure(*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/connect/aws-connect-userhierarchystructure_levelfive.go b/cloudformation/connect/aws-connect-userhierarchystructure_levelfive.go
new file mode 100644
index 0000000000..06fd706101
--- /dev/null
+++ b/cloudformation/connect/aws-connect-userhierarchystructure_levelfive.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserHierarchyStructure_LevelFive AWS CloudFormation Resource (AWS::Connect::UserHierarchyStructure.LevelFive)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfive.html
+type UserHierarchyStructure_LevelFive struct {
+
+	// HierarchyLevelArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfive.html#cfn-connect-userhierarchystructure-levelfive-hierarchylevelarn
+	HierarchyLevelArn *string `json:"HierarchyLevelArn,omitempty"`
+
+	// HierarchyLevelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfive.html#cfn-connect-userhierarchystructure-levelfive-hierarchylevelid
+	HierarchyLevelId *string `json:"HierarchyLevelId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfive.html#cfn-connect-userhierarchystructure-levelfive-name
+	Name string `json:"Name"`
+
+	// 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 *UserHierarchyStructure_LevelFive) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyStructure.LevelFive"
+}
diff --git a/cloudformation/connect/aws-connect-userhierarchystructure_levelfour.go b/cloudformation/connect/aws-connect-userhierarchystructure_levelfour.go
new file mode 100644
index 0000000000..de87600c46
--- /dev/null
+++ b/cloudformation/connect/aws-connect-userhierarchystructure_levelfour.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserHierarchyStructure_LevelFour AWS CloudFormation Resource (AWS::Connect::UserHierarchyStructure.LevelFour)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfour.html
+type UserHierarchyStructure_LevelFour struct {
+
+	// HierarchyLevelArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfour.html#cfn-connect-userhierarchystructure-levelfour-hierarchylevelarn
+	HierarchyLevelArn *string `json:"HierarchyLevelArn,omitempty"`
+
+	// HierarchyLevelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfour.html#cfn-connect-userhierarchystructure-levelfour-hierarchylevelid
+	HierarchyLevelId *string `json:"HierarchyLevelId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelfour.html#cfn-connect-userhierarchystructure-levelfour-name
+	Name string `json:"Name"`
+
+	// 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 *UserHierarchyStructure_LevelFour) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyStructure.LevelFour"
+}
diff --git a/cloudformation/connect/aws-connect-userhierarchystructure_levelone.go b/cloudformation/connect/aws-connect-userhierarchystructure_levelone.go
new file mode 100644
index 0000000000..ebc61defbe
--- /dev/null
+++ b/cloudformation/connect/aws-connect-userhierarchystructure_levelone.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserHierarchyStructure_LevelOne AWS CloudFormation Resource (AWS::Connect::UserHierarchyStructure.LevelOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelone.html
+type UserHierarchyStructure_LevelOne struct {
+
+	// HierarchyLevelArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelone.html#cfn-connect-userhierarchystructure-levelone-hierarchylevelarn
+	HierarchyLevelArn *string `json:"HierarchyLevelArn,omitempty"`
+
+	// HierarchyLevelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelone.html#cfn-connect-userhierarchystructure-levelone-hierarchylevelid
+	HierarchyLevelId *string `json:"HierarchyLevelId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelone.html#cfn-connect-userhierarchystructure-levelone-name
+	Name string `json:"Name"`
+
+	// 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 *UserHierarchyStructure_LevelOne) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyStructure.LevelOne"
+}
diff --git a/cloudformation/connect/aws-connect-userhierarchystructure_levelthree.go b/cloudformation/connect/aws-connect-userhierarchystructure_levelthree.go
new file mode 100644
index 0000000000..2c78c11db6
--- /dev/null
+++ b/cloudformation/connect/aws-connect-userhierarchystructure_levelthree.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserHierarchyStructure_LevelThree AWS CloudFormation Resource (AWS::Connect::UserHierarchyStructure.LevelThree)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelthree.html
+type UserHierarchyStructure_LevelThree struct {
+
+	// HierarchyLevelArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelthree.html#cfn-connect-userhierarchystructure-levelthree-hierarchylevelarn
+	HierarchyLevelArn *string `json:"HierarchyLevelArn,omitempty"`
+
+	// HierarchyLevelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelthree.html#cfn-connect-userhierarchystructure-levelthree-hierarchylevelid
+	HierarchyLevelId *string `json:"HierarchyLevelId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-levelthree.html#cfn-connect-userhierarchystructure-levelthree-name
+	Name string `json:"Name"`
+
+	// 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 *UserHierarchyStructure_LevelThree) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyStructure.LevelThree"
+}
diff --git a/cloudformation/connect/aws-connect-userhierarchystructure_leveltwo.go b/cloudformation/connect/aws-connect-userhierarchystructure_leveltwo.go
new file mode 100644
index 0000000000..bad97e43bd
--- /dev/null
+++ b/cloudformation/connect/aws-connect-userhierarchystructure_leveltwo.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserHierarchyStructure_LevelTwo AWS CloudFormation Resource (AWS::Connect::UserHierarchyStructure.LevelTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-leveltwo.html
+type UserHierarchyStructure_LevelTwo struct {
+
+	// HierarchyLevelArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-leveltwo.html#cfn-connect-userhierarchystructure-leveltwo-hierarchylevelarn
+	HierarchyLevelArn *string `json:"HierarchyLevelArn,omitempty"`
+
+	// HierarchyLevelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-leveltwo.html#cfn-connect-userhierarchystructure-leveltwo-hierarchylevelid
+	HierarchyLevelId *string `json:"HierarchyLevelId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-leveltwo.html#cfn-connect-userhierarchystructure-leveltwo-name
+	Name string `json:"Name"`
+
+	// 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 *UserHierarchyStructure_LevelTwo) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyStructure.LevelTwo"
+}
diff --git a/cloudformation/connect/aws-connect-userhierarchystructure_userhierarchystructure.go b/cloudformation/connect/aws-connect-userhierarchystructure_userhierarchystructure.go
new file mode 100644
index 0000000000..d3ee7a4011
--- /dev/null
+++ b/cloudformation/connect/aws-connect-userhierarchystructure_userhierarchystructure.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package connect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserHierarchyStructure_UserHierarchyStructure AWS CloudFormation Resource (AWS::Connect::UserHierarchyStructure.UserHierarchyStructure)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-userhierarchystructure.html
+type UserHierarchyStructure_UserHierarchyStructure struct {
+
+	// LevelFive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-userhierarchystructure.html#cfn-connect-userhierarchystructure-userhierarchystructure-levelfive
+	LevelFive *UserHierarchyStructure_LevelFive `json:"LevelFive,omitempty"`
+
+	// LevelFour AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-userhierarchystructure.html#cfn-connect-userhierarchystructure-userhierarchystructure-levelfour
+	LevelFour *UserHierarchyStructure_LevelFour `json:"LevelFour,omitempty"`
+
+	// LevelOne AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-userhierarchystructure.html#cfn-connect-userhierarchystructure-userhierarchystructure-levelone
+	LevelOne *UserHierarchyStructure_LevelOne `json:"LevelOne,omitempty"`
+
+	// LevelThree AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-userhierarchystructure.html#cfn-connect-userhierarchystructure-userhierarchystructure-levelthree
+	LevelThree *UserHierarchyStructure_LevelThree `json:"LevelThree,omitempty"`
+
+	// LevelTwo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-userhierarchystructure-userhierarchystructure.html#cfn-connect-userhierarchystructure-userhierarchystructure-leveltwo
+	LevelTwo *UserHierarchyStructure_LevelTwo `json:"LevelTwo,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 *UserHierarchyStructure_UserHierarchyStructure) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyStructure.UserHierarchyStructure"
+}
diff --git a/cloudformation/datazone/aws-datazone-environment.go b/cloudformation/datazone/aws-datazone-environment.go
index d3a0701fce..3b06e60527 100644
--- a/cloudformation/datazone/aws-datazone-environment.go
+++ b/cloudformation/datazone/aws-datazone-environment.go
@@ -23,10 +23,25 @@ type Environment struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environment.html#cfn-datazone-environment-domainidentifier
 	DomainIdentifier string `json:"DomainIdentifier"`
 
+	// EnvironmentAccountIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environment.html#cfn-datazone-environment-environmentaccountidentifier
+	EnvironmentAccountIdentifier *string `json:"EnvironmentAccountIdentifier,omitempty"`
+
+	// EnvironmentAccountRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environment.html#cfn-datazone-environment-environmentaccountregion
+	EnvironmentAccountRegion *string `json:"EnvironmentAccountRegion,omitempty"`
+
 	// EnvironmentProfileIdentifier AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environment.html#cfn-datazone-environment-environmentprofileidentifier
-	EnvironmentProfileIdentifier string `json:"EnvironmentProfileIdentifier"`
+	EnvironmentProfileIdentifier *string `json:"EnvironmentProfileIdentifier,omitempty"`
+
+	// EnvironmentRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environment.html#cfn-datazone-environment-environmentrolearn
+	EnvironmentRoleArn *string `json:"EnvironmentRoleArn,omitempty"`
 
 	// GlossaryTerms AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/datazone/aws-datazone-environmentactions.go b/cloudformation/datazone/aws-datazone-environmentactions.go
new file mode 100644
index 0000000000..a8d51d6c2e
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-environmentactions.go
@@ -0,0 +1,142 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// EnvironmentActions AWS CloudFormation Resource (AWS::DataZone::EnvironmentActions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentactions.html
+type EnvironmentActions struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentactions.html#cfn-datazone-environmentactions-description
+	Description *string `json:"Description,omitempty"`
+
+	// DomainIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentactions.html#cfn-datazone-environmentactions-domainidentifier
+	DomainIdentifier *string `json:"DomainIdentifier,omitempty"`
+
+	// EnvironmentIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentactions.html#cfn-datazone-environmentactions-environmentidentifier
+	EnvironmentIdentifier *string `json:"EnvironmentIdentifier,omitempty"`
+
+	// Identifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentactions.html#cfn-datazone-environmentactions-identifier
+	Identifier *string `json:"Identifier,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentactions.html#cfn-datazone-environmentactions-name
+	Name string `json:"Name"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-environmentactions.html#cfn-datazone-environmentactions-parameters
+	Parameters *EnvironmentActions_AwsConsoleLinkParameters `json:"Parameters,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 *EnvironmentActions) AWSCloudFormationType() string {
+	return "AWS::DataZone::EnvironmentActions"
+}
+
+// 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 EnvironmentActions) MarshalJSON() ([]byte, error) {
+	type Properties EnvironmentActions
+	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 *EnvironmentActions) UnmarshalJSON(b []byte) error {
+	type Properties EnvironmentActions
+	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 = EnvironmentActions(*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/datazone/aws-datazone-environmentactions_awsconsolelinkparameters.go b/cloudformation/datazone/aws-datazone-environmentactions_awsconsolelinkparameters.go
new file mode 100644
index 0000000000..ccad4aa3ba
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-environmentactions_awsconsolelinkparameters.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// EnvironmentActions_AwsConsoleLinkParameters AWS CloudFormation Resource (AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-environmentactions-awsconsolelinkparameters.html
+type EnvironmentActions_AwsConsoleLinkParameters struct {
+
+	// Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-environmentactions-awsconsolelinkparameters.html#cfn-datazone-environmentactions-awsconsolelinkparameters-uri
+	Uri *string `json:"Uri,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 *EnvironmentActions_AwsConsoleLinkParameters) AWSCloudFormationType() string {
+	return "AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters"
+}
diff --git a/cloudformation/datazone/aws-datazone-groupprofile.go b/cloudformation/datazone/aws-datazone-groupprofile.go
new file mode 100644
index 0000000000..2b75aaf14e
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-groupprofile.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// GroupProfile AWS CloudFormation Resource (AWS::DataZone::GroupProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-groupprofile.html
+type GroupProfile struct {
+
+	// DomainIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-groupprofile.html#cfn-datazone-groupprofile-domainidentifier
+	DomainIdentifier string `json:"DomainIdentifier"`
+
+	// GroupIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-groupprofile.html#cfn-datazone-groupprofile-groupidentifier
+	GroupIdentifier string `json:"GroupIdentifier"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-groupprofile.html#cfn-datazone-groupprofile-status
+	Status *string `json:"Status,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 *GroupProfile) AWSCloudFormationType() string {
+	return "AWS::DataZone::GroupProfile"
+}
+
+// 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 GroupProfile) MarshalJSON() ([]byte, error) {
+	type Properties GroupProfile
+	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 *GroupProfile) UnmarshalJSON(b []byte) error {
+	type Properties GroupProfile
+	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 = GroupProfile(*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/datazone/aws-datazone-projectmembership.go b/cloudformation/datazone/aws-datazone-projectmembership.go
new file mode 100644
index 0000000000..e2cb22e8a8
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-projectmembership.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ProjectMembership AWS CloudFormation Resource (AWS::DataZone::ProjectMembership)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-projectmembership.html
+type ProjectMembership struct {
+
+	// Designation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-projectmembership.html#cfn-datazone-projectmembership-designation
+	Designation string `json:"Designation"`
+
+	// DomainIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-projectmembership.html#cfn-datazone-projectmembership-domainidentifier
+	DomainIdentifier string `json:"DomainIdentifier"`
+
+	// Member AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-projectmembership.html#cfn-datazone-projectmembership-member
+	Member *ProjectMembership_Member `json:"Member"`
+
+	// ProjectIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-projectmembership.html#cfn-datazone-projectmembership-projectidentifier
+	ProjectIdentifier string `json:"ProjectIdentifier"`
+
+	// 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 *ProjectMembership) AWSCloudFormationType() string {
+	return "AWS::DataZone::ProjectMembership"
+}
+
+// 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 ProjectMembership) MarshalJSON() ([]byte, error) {
+	type Properties ProjectMembership
+	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 *ProjectMembership) UnmarshalJSON(b []byte) error {
+	type Properties ProjectMembership
+	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 = ProjectMembership(*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/datazone/aws-datazone-projectmembership_member.go b/cloudformation/datazone/aws-datazone-projectmembership_member.go
new file mode 100644
index 0000000000..e42c747fcd
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-projectmembership_member.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ProjectMembership_Member AWS CloudFormation Resource (AWS::DataZone::ProjectMembership.Member)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-projectmembership-member.html
+type ProjectMembership_Member struct {
+
+	// GroupIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-projectmembership-member.html#cfn-datazone-projectmembership-member-groupidentifier
+	GroupIdentifier *string `json:"GroupIdentifier,omitempty"`
+
+	// UserIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-projectmembership-member.html#cfn-datazone-projectmembership-member-useridentifier
+	UserIdentifier *string `json:"UserIdentifier,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 *ProjectMembership_Member) AWSCloudFormationType() string {
+	return "AWS::DataZone::ProjectMembership.Member"
+}
diff --git a/cloudformation/datazone/aws-datazone-userprofile.go b/cloudformation/datazone/aws-datazone-userprofile.go
new file mode 100644
index 0000000000..b6cf817c64
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-userprofile.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserProfile AWS CloudFormation Resource (AWS::DataZone::UserProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-userprofile.html
+type UserProfile struct {
+
+	// DomainIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-userprofile.html#cfn-datazone-userprofile-domainidentifier
+	DomainIdentifier string `json:"DomainIdentifier"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-userprofile.html#cfn-datazone-userprofile-status
+	Status *string `json:"Status,omitempty"`
+
+	// UserIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-userprofile.html#cfn-datazone-userprofile-useridentifier
+	UserIdentifier string `json:"UserIdentifier"`
+
+	// UserType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datazone-userprofile.html#cfn-datazone-userprofile-usertype
+	UserType *string `json:"UserType,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 *UserProfile) AWSCloudFormationType() string {
+	return "AWS::DataZone::UserProfile"
+}
+
+// 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 UserProfile) MarshalJSON() ([]byte, error) {
+	type Properties UserProfile
+	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 *UserProfile) UnmarshalJSON(b []byte) error {
+	type Properties UserProfile
+	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 = UserProfile(*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/datazone/aws-datazone-userprofile_iamuserprofiledetails.go b/cloudformation/datazone/aws-datazone-userprofile_iamuserprofiledetails.go
new file mode 100644
index 0000000000..c19e37e682
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-userprofile_iamuserprofiledetails.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserProfile_IamUserProfileDetails AWS CloudFormation Resource (AWS::DataZone::UserProfile.IamUserProfileDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-iamuserprofiledetails.html
+type UserProfile_IamUserProfileDetails struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-iamuserprofiledetails.html#cfn-datazone-userprofile-iamuserprofiledetails-arn
+	Arn *string `json:"Arn,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 *UserProfile_IamUserProfileDetails) AWSCloudFormationType() string {
+	return "AWS::DataZone::UserProfile.IamUserProfileDetails"
+}
diff --git a/cloudformation/datazone/aws-datazone-userprofile_ssouserprofiledetails.go b/cloudformation/datazone/aws-datazone-userprofile_ssouserprofiledetails.go
new file mode 100644
index 0000000000..8b1244a4b1
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-userprofile_ssouserprofiledetails.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserProfile_SsoUserProfileDetails AWS CloudFormation Resource (AWS::DataZone::UserProfile.SsoUserProfileDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-ssouserprofiledetails.html
+type UserProfile_SsoUserProfileDetails struct {
+
+	// FirstName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-ssouserprofiledetails.html#cfn-datazone-userprofile-ssouserprofiledetails-firstname
+	FirstName *string `json:"FirstName,omitempty"`
+
+	// LastName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-ssouserprofiledetails.html#cfn-datazone-userprofile-ssouserprofiledetails-lastname
+	LastName *string `json:"LastName,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-ssouserprofiledetails.html#cfn-datazone-userprofile-ssouserprofiledetails-username
+	Username *string `json:"Username,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 *UserProfile_SsoUserProfileDetails) AWSCloudFormationType() string {
+	return "AWS::DataZone::UserProfile.SsoUserProfileDetails"
+}
diff --git a/cloudformation/datazone/aws-datazone-userprofile_userprofiledetails.go b/cloudformation/datazone/aws-datazone-userprofile_userprofiledetails.go
new file mode 100644
index 0000000000..49dcf2d71f
--- /dev/null
+++ b/cloudformation/datazone/aws-datazone-userprofile_userprofiledetails.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package datazone
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserProfile_UserProfileDetails AWS CloudFormation Resource (AWS::DataZone::UserProfile.UserProfileDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-userprofiledetails.html
+type UserProfile_UserProfileDetails struct {
+
+	// Iam AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-userprofiledetails.html#cfn-datazone-userprofile-userprofiledetails-iam
+	Iam *UserProfile_IamUserProfileDetails `json:"Iam,omitempty"`
+
+	// Sso AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datazone-userprofile-userprofiledetails.html#cfn-datazone-userprofile-userprofiledetails-sso
+	Sso *UserProfile_SsoUserProfileDetails `json:"Sso,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 *UserProfile_UserProfileDetails) AWSCloudFormationType() string {
+	return "AWS::DataZone::UserProfile.UserProfileDetails"
+}
diff --git a/cloudformation/deadline/aws-deadline-farm.go b/cloudformation/deadline/aws-deadline-farm.go
index cd52344967..7cfb3fbb9e 100644
--- a/cloudformation/deadline/aws-deadline-farm.go
+++ b/cloudformation/deadline/aws-deadline-farm.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // Farm AWS CloudFormation Resource (AWS::Deadline::Farm)
@@ -28,6 +29,11 @@ type Farm struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-farm.html#cfn-deadline-farm-kmskeyarn
 	KmsKeyArn *string `json:"KmsKeyArn,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-farm.html#cfn-deadline-farm-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/deadline/aws-deadline-fleet.go b/cloudformation/deadline/aws-deadline-fleet.go
index 5e2088f303..eb8ef546ee 100644
--- a/cloudformation/deadline/aws-deadline-fleet.go
+++ b/cloudformation/deadline/aws-deadline-fleet.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // Fleet AWS CloudFormation Resource (AWS::Deadline::Fleet)
@@ -29,9 +30,9 @@ type Fleet struct {
 	DisplayName string `json:"DisplayName"`
 
 	// FarmId AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-fleet.html#cfn-deadline-fleet-farmid
-	FarmId *string `json:"FarmId,omitempty"`
+	FarmId string `json:"FarmId"`
 
 	// MaxWorkerCount AWS CloudFormation Property
 	// Required: true
@@ -48,6 +49,11 @@ type Fleet struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-fleet.html#cfn-deadline-fleet-rolearn
 	RoleArn string `json:"RoleArn"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-fleet.html#cfn-deadline-fleet-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/deadline/aws-deadline-licenseendpoint.go b/cloudformation/deadline/aws-deadline-licenseendpoint.go
index 50e5ba6923..82a853d424 100644
--- a/cloudformation/deadline/aws-deadline-licenseendpoint.go
+++ b/cloudformation/deadline/aws-deadline-licenseendpoint.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // LicenseEndpoint AWS CloudFormation Resource (AWS::Deadline::LicenseEndpoint)
@@ -23,6 +24,11 @@ type LicenseEndpoint struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-licenseendpoint.html#cfn-deadline-licenseendpoint-subnetids
 	SubnetIds []string `json:"SubnetIds"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-licenseendpoint.html#cfn-deadline-licenseendpoint-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// VpcId AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-licenseendpoint.html#cfn-deadline-licenseendpoint-vpcid
diff --git a/cloudformation/deadline/aws-deadline-meteredproduct.go b/cloudformation/deadline/aws-deadline-meteredproduct.go
index ef01093fff..6bbea16390 100644
--- a/cloudformation/deadline/aws-deadline-meteredproduct.go
+++ b/cloudformation/deadline/aws-deadline-meteredproduct.go
@@ -13,31 +13,16 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-meteredproduct.html
 type MeteredProduct struct {
 
-	// Family AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-meteredproduct.html#cfn-deadline-meteredproduct-family
-	Family *string `json:"Family,omitempty"`
-
 	// LicenseEndpointId AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-meteredproduct.html#cfn-deadline-meteredproduct-licenseendpointid
 	LicenseEndpointId *string `json:"LicenseEndpointId,omitempty"`
 
-	// Port AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-meteredproduct.html#cfn-deadline-meteredproduct-port
-	Port *int `json:"Port,omitempty"`
-
 	// ProductId AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-meteredproduct.html#cfn-deadline-meteredproduct-productid
 	ProductId *string `json:"ProductId,omitempty"`
 
-	// Vendor AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-meteredproduct.html#cfn-deadline-meteredproduct-vendor
-	Vendor *string `json:"Vendor,omitempty"`
-
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/deadline/aws-deadline-monitor.go b/cloudformation/deadline/aws-deadline-monitor.go
new file mode 100644
index 0000000000..d1499904fd
--- /dev/null
+++ b/cloudformation/deadline/aws-deadline-monitor.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package deadline
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Monitor AWS CloudFormation Resource (AWS::Deadline::Monitor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-monitor.html
+type Monitor struct {
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-monitor.html#cfn-deadline-monitor-displayname
+	DisplayName string `json:"DisplayName"`
+
+	// IdentityCenterInstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-monitor.html#cfn-deadline-monitor-identitycenterinstancearn
+	IdentityCenterInstanceArn string `json:"IdentityCenterInstanceArn"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-monitor.html#cfn-deadline-monitor-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// Subdomain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-monitor.html#cfn-deadline-monitor-subdomain
+	Subdomain string `json:"Subdomain"`
+
+	// 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 *Monitor) AWSCloudFormationType() string {
+	return "AWS::Deadline::Monitor"
+}
+
+// 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 Monitor) MarshalJSON() ([]byte, error) {
+	type Properties Monitor
+	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 *Monitor) UnmarshalJSON(b []byte) error {
+	type Properties Monitor
+	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 = Monitor(*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/deadline/aws-deadline-queue.go b/cloudformation/deadline/aws-deadline-queue.go
index 323d8bf8a0..d472a8a8e8 100644
--- a/cloudformation/deadline/aws-deadline-queue.go
+++ b/cloudformation/deadline/aws-deadline-queue.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // Queue AWS CloudFormation Resource (AWS::Deadline::Queue)
@@ -34,9 +35,9 @@ type Queue struct {
 	DisplayName string `json:"DisplayName"`
 
 	// FarmId AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-queue.html#cfn-deadline-queue-farmid
-	FarmId *string `json:"FarmId,omitempty"`
+	FarmId string `json:"FarmId"`
 
 	// JobAttachmentSettings AWS CloudFormation Property
 	// Required: false
@@ -58,6 +59,11 @@ type Queue struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-queue.html#cfn-deadline-queue-rolearn
 	RoleArn *string `json:"RoleArn,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-queue.html#cfn-deadline-queue-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/deadline/aws-deadline-storageprofile.go b/cloudformation/deadline/aws-deadline-storageprofile.go
index 3f224142d6..9465801d42 100644
--- a/cloudformation/deadline/aws-deadline-storageprofile.go
+++ b/cloudformation/deadline/aws-deadline-storageprofile.go
@@ -19,9 +19,9 @@ type StorageProfile struct {
 	DisplayName string `json:"DisplayName"`
 
 	// FarmId AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-deadline-storageprofile.html#cfn-deadline-storageprofile-farmid
-	FarmId *string `json:"FarmId,omitempty"`
+	FarmId string `json:"FarmId"`
 
 	// FileSystemLocations AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/dms/aws-dms-replicationconfig.go b/cloudformation/dms/aws-dms-replicationconfig.go
index 8d2dddaffa..22d91f7b88 100644
--- a/cloudformation/dms/aws-dms-replicationconfig.go
+++ b/cloudformation/dms/aws-dms-replicationconfig.go
@@ -15,19 +15,14 @@ import (
 type ReplicationConfig struct {
 
 	// ComputeConfig AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html#cfn-dms-replicationconfig-computeconfig
-	ComputeConfig *ReplicationConfig_ComputeConfig `json:"ComputeConfig,omitempty"`
-
-	// ReplicationConfigArn AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html#cfn-dms-replicationconfig-replicationconfigarn
-	ReplicationConfigArn *string `json:"ReplicationConfigArn,omitempty"`
+	ComputeConfig *ReplicationConfig_ComputeConfig `json:"ComputeConfig"`
 
 	// ReplicationConfigIdentifier AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html#cfn-dms-replicationconfig-replicationconfigidentifier
-	ReplicationConfigIdentifier *string `json:"ReplicationConfigIdentifier,omitempty"`
+	ReplicationConfigIdentifier string `json:"ReplicationConfigIdentifier"`
 
 	// ReplicationSettings AWS CloudFormation Property
 	// Required: false
@@ -35,9 +30,9 @@ type ReplicationConfig struct {
 	ReplicationSettings interface{} `json:"ReplicationSettings,omitempty"`
 
 	// ReplicationType AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html#cfn-dms-replicationconfig-replicationtype
-	ReplicationType *string `json:"ReplicationType,omitempty"`
+	ReplicationType string `json:"ReplicationType"`
 
 	// ResourceIdentifier AWS CloudFormation Property
 	// Required: false
@@ -45,9 +40,9 @@ type ReplicationConfig struct {
 	ResourceIdentifier *string `json:"ResourceIdentifier,omitempty"`
 
 	// SourceEndpointArn AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html#cfn-dms-replicationconfig-sourceendpointarn
-	SourceEndpointArn *string `json:"SourceEndpointArn,omitempty"`
+	SourceEndpointArn string `json:"SourceEndpointArn"`
 
 	// SupplementalSettings AWS CloudFormation Property
 	// Required: false
@@ -55,9 +50,9 @@ type ReplicationConfig struct {
 	SupplementalSettings interface{} `json:"SupplementalSettings,omitempty"`
 
 	// TableMappings AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html#cfn-dms-replicationconfig-tablemappings
-	TableMappings interface{} `json:"TableMappings,omitempty"`
+	TableMappings interface{} `json:"TableMappings"`
 
 	// Tags AWS CloudFormation Property
 	// Required: false
@@ -65,9 +60,9 @@ type ReplicationConfig struct {
 	Tags []tags.Tag `json:"Tags,omitempty"`
 
 	// TargetEndpointArn AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationconfig.html#cfn-dms-replicationconfig-targetendpointarn
-	TargetEndpointArn *string `json:"TargetEndpointArn,omitempty"`
+	TargetEndpointArn string `json:"TargetEndpointArn"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/dms/aws-dms-replicationinstance.go b/cloudformation/dms/aws-dms-replicationinstance.go
index bcabe399c1..a9e4cf78c5 100644
--- a/cloudformation/dms/aws-dms-replicationinstance.go
+++ b/cloudformation/dms/aws-dms-replicationinstance.go
@@ -49,6 +49,11 @@ type ReplicationInstance struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz
 	MultiAZ *bool `json:"MultiAZ,omitempty"`
 
+	// NetworkType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-networktype
+	NetworkType *string `json:"NetworkType,omitempty"`
+
 	// PreferredMaintenanceWindow AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-preferredmaintenancewindow
diff --git a/cloudformation/dynamodb/aws-dynamodb-globaltable.go b/cloudformation/dynamodb/aws-dynamodb-globaltable.go
index da24cd1dc5..e83f3e2e4f 100644
--- a/cloudformation/dynamodb/aws-dynamodb-globaltable.go
+++ b/cloudformation/dynamodb/aws-dynamodb-globaltable.go
@@ -63,6 +63,11 @@ type GlobalTable struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-timetolivespecification
 	TimeToLiveSpecification *GlobalTable_TimeToLiveSpecification `json:"TimeToLiveSpecification,omitempty"`
 
+	// WriteOnDemandThroughputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-writeondemandthroughputsettings
+	WriteOnDemandThroughputSettings *GlobalTable_WriteOnDemandThroughputSettings `json:"WriteOnDemandThroughputSettings,omitempty"`
+
 	// WriteProvisionedThroughputSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-writeprovisionedthroughputsettings
diff --git a/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go b/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
index 5222fc6cfd..b835cfbad3 100644
--- a/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
+++ b/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
@@ -25,6 +25,11 @@ type GlobalTable_GlobalSecondaryIndex struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-globalsecondaryindex.html#cfn-dynamodb-globaltable-globalsecondaryindex-projection
 	Projection *GlobalTable_Projection `json:"Projection"`
 
+	// WriteOnDemandThroughputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-globalsecondaryindex.html#cfn-dynamodb-globaltable-globalsecondaryindex-writeondemandthroughputsettings
+	WriteOnDemandThroughputSettings *GlobalTable_WriteOnDemandThroughputSettings `json:"WriteOnDemandThroughputSettings,omitempty"`
+
 	// WriteProvisionedThroughputSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-globalsecondaryindex.html#cfn-dynamodb-globaltable-globalsecondaryindex-writeprovisionedthroughputsettings
diff --git a/cloudformation/dynamodb/aws-dynamodb-globaltable_readondemandthroughputsettings.go b/cloudformation/dynamodb/aws-dynamodb-globaltable_readondemandthroughputsettings.go
new file mode 100644
index 0000000000..026f9b9eae
--- /dev/null
+++ b/cloudformation/dynamodb/aws-dynamodb-globaltable_readondemandthroughputsettings.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package dynamodb
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// GlobalTable_ReadOnDemandThroughputSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-readondemandthroughputsettings.html
+type GlobalTable_ReadOnDemandThroughputSettings struct {
+
+	// MaxReadRequestUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-readondemandthroughputsettings.html#cfn-dynamodb-globaltable-readondemandthroughputsettings-maxreadrequestunits
+	MaxReadRequestUnits *int `json:"MaxReadRequestUnits,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 *GlobalTable_ReadOnDemandThroughputSettings) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+}
diff --git a/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go b/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
index f282431d8f..96b31bd20d 100644
--- a/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
+++ b/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
@@ -20,6 +20,11 @@ type GlobalTable_ReplicaGlobalSecondaryIndexSpecification struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaglobalsecondaryindexspecification.html#cfn-dynamodb-globaltable-replicaglobalsecondaryindexspecification-indexname
 	IndexName string `json:"IndexName"`
 
+	// ReadOnDemandThroughputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaglobalsecondaryindexspecification.html#cfn-dynamodb-globaltable-replicaglobalsecondaryindexspecification-readondemandthroughputsettings
+	ReadOnDemandThroughputSettings *GlobalTable_ReadOnDemandThroughputSettings `json:"ReadOnDemandThroughputSettings,omitempty"`
+
 	// ReadProvisionedThroughputSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaglobalsecondaryindexspecification.html#cfn-dynamodb-globaltable-replicaglobalsecondaryindexspecification-readprovisionedthroughputsettings
diff --git a/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go b/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
index a5b88856bb..16d80129c3 100644
--- a/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
+++ b/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
@@ -36,6 +36,11 @@ type GlobalTable_ReplicaSpecification struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-pointintimerecoveryspecification
 	PointInTimeRecoverySpecification *GlobalTable_PointInTimeRecoverySpecification `json:"PointInTimeRecoverySpecification,omitempty"`
 
+	// ReadOnDemandThroughputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-readondemandthroughputsettings
+	ReadOnDemandThroughputSettings *GlobalTable_ReadOnDemandThroughputSettings `json:"ReadOnDemandThroughputSettings,omitempty"`
+
 	// ReadProvisionedThroughputSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-readprovisionedthroughputsettings
diff --git a/cloudformation/dynamodb/aws-dynamodb-globaltable_writeondemandthroughputsettings.go b/cloudformation/dynamodb/aws-dynamodb-globaltable_writeondemandthroughputsettings.go
new file mode 100644
index 0000000000..6818d1573f
--- /dev/null
+++ b/cloudformation/dynamodb/aws-dynamodb-globaltable_writeondemandthroughputsettings.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package dynamodb
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// GlobalTable_WriteOnDemandThroughputSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-writeondemandthroughputsettings.html
+type GlobalTable_WriteOnDemandThroughputSettings struct {
+
+	// MaxWriteRequestUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-writeondemandthroughputsettings.html#cfn-dynamodb-globaltable-writeondemandthroughputsettings-maxwriterequestunits
+	MaxWriteRequestUnits *int `json:"MaxWriteRequestUnits,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 *GlobalTable_WriteOnDemandThroughputSettings) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+}
diff --git a/cloudformation/dynamodb/aws-dynamodb-table.go b/cloudformation/dynamodb/aws-dynamodb-table.go
index f5c15eaf29..852d1642f3 100644
--- a/cloudformation/dynamodb/aws-dynamodb-table.go
+++ b/cloudformation/dynamodb/aws-dynamodb-table.go
@@ -59,6 +59,11 @@ type Table struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-localsecondaryindexes
 	LocalSecondaryIndexes []Table_LocalSecondaryIndex `json:"LocalSecondaryIndexes,omitempty"`
 
+	// OnDemandThroughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-ondemandthroughput
+	OnDemandThroughput *Table_OnDemandThroughput `json:"OnDemandThroughput,omitempty"`
+
 	// PointInTimeRecoverySpecification AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-pointintimerecoveryspecification
diff --git a/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go b/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
index cf913d3f45..5f63751468 100644
--- a/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
+++ b/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
@@ -25,6 +25,11 @@ type Table_GlobalSecondaryIndex struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-globalsecondaryindex.html#cfn-dynamodb-table-globalsecondaryindex-keyschema
 	KeySchema []Table_KeySchema `json:"KeySchema"`
 
+	// OnDemandThroughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-globalsecondaryindex.html#cfn-dynamodb-table-globalsecondaryindex-ondemandthroughput
+	OnDemandThroughput *Table_OnDemandThroughput `json:"OnDemandThroughput,omitempty"`
+
 	// Projection AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-globalsecondaryindex.html#cfn-dynamodb-table-globalsecondaryindex-projection
diff --git a/cloudformation/dynamodb/aws-dynamodb-table_ondemandthroughput.go b/cloudformation/dynamodb/aws-dynamodb-table_ondemandthroughput.go
new file mode 100644
index 0000000000..4cd00151cc
--- /dev/null
+++ b/cloudformation/dynamodb/aws-dynamodb-table_ondemandthroughput.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package dynamodb
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Table_OnDemandThroughput AWS CloudFormation Resource (AWS::DynamoDB::Table.OnDemandThroughput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ondemandthroughput.html
+type Table_OnDemandThroughput struct {
+
+	// MaxReadRequestUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ondemandthroughput.html#cfn-dynamodb-table-ondemandthroughput-maxreadrequestunits
+	MaxReadRequestUnits *int `json:"MaxReadRequestUnits,omitempty"`
+
+	// MaxWriteRequestUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ondemandthroughput.html#cfn-dynamodb-table-ondemandthroughput-maxwriterequestunits
+	MaxWriteRequestUnits *int `json:"MaxWriteRequestUnits,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 *Table_OnDemandThroughput) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.OnDemandThroughput"
+}
diff --git a/cloudformation/ec2/aws-ec2-customergateway.go b/cloudformation/ec2/aws-ec2-customergateway.go
index ed4196b282..4209cf01fa 100644
--- a/cloudformation/ec2/aws-ec2-customergateway.go
+++ b/cloudformation/ec2/aws-ec2-customergateway.go
@@ -19,6 +19,11 @@ type CustomerGateway struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customergateway.html#cfn-ec2-customergateway-bgpasn
 	BgpAsn *int `json:"BgpAsn,omitempty"`
 
+	// BgpAsnExtended AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customergateway.html#cfn-ec2-customergateway-bgpasnextended
+	BgpAsnExtended *float64 `json:"BgpAsnExtended,omitempty"`
+
 	// CertificateArn AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customergateway.html#cfn-ec2-customergateway-certificatearn
diff --git a/cloudformation/ec2/aws-ec2-instance_state.go b/cloudformation/ec2/aws-ec2-instance_state.go
new file mode 100644
index 0000000000..ca8d55e5f0
--- /dev/null
+++ b/cloudformation/ec2/aws-ec2-instance_state.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ec2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Instance_State AWS CloudFormation Resource (AWS::EC2::Instance.State)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-state.html
+type Instance_State struct {
+
+	// Code AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-state.html#cfn-ec2-instance-state-code
+	Code *string `json:"Code,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-state.html#cfn-ec2-instance-state-name
+	Name *string `json:"Name,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 *Instance_State) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.State"
+}
diff --git a/cloudformation/ec2/aws-ec2-ipam.go b/cloudformation/ec2/aws-ec2-ipam.go
index 0b20572261..448bffc71a 100644
--- a/cloudformation/ec2/aws-ec2-ipam.go
+++ b/cloudformation/ec2/aws-ec2-ipam.go
@@ -19,6 +19,11 @@ type IPAM struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html#cfn-ec2-ipam-description
 	Description *string `json:"Description,omitempty"`
 
+	// EnablePrivateGua AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html#cfn-ec2-ipam-enableprivategua
+	EnablePrivateGua *bool `json:"EnablePrivateGua,omitempty"`
+
 	// OperatingRegions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html#cfn-ec2-ipam-operatingregions
diff --git a/cloudformation/ec2/aws-ec2-subnet.go b/cloudformation/ec2/aws-ec2-subnet.go
index 0fd61f8fc9..8379d764c5 100644
--- a/cloudformation/ec2/aws-ec2-subnet.go
+++ b/cloudformation/ec2/aws-ec2-subnet.go
@@ -59,11 +59,6 @@ type Subnet struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-ipv6cidrblock
 	Ipv6CidrBlock *string `json:"Ipv6CidrBlock,omitempty"`
 
-	// Ipv6CidrBlocks AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-ipv6cidrblocks
-	Ipv6CidrBlocks []string `json:"Ipv6CidrBlocks,omitempty"`
-
 	// Ipv6IpamPoolId AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-ipv6ipampoolid
diff --git a/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go b/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
index 626eadd3e8..888cc78bc9 100644
--- a/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
+++ b/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // TrafficMirrorFilterRule AWS CloudFormation Resource (AWS::EC2::TrafficMirrorFilterRule)
@@ -53,6 +54,11 @@ type TrafficMirrorFilterRule struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-sourceportrange
 	SourcePortRange *TrafficMirrorFilterRule_TrafficMirrorPortRange `json:"SourcePortRange,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// TrafficDirection AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-trafficdirection
diff --git a/cloudformation/ec2/aws-ec2-transitgateway.go b/cloudformation/ec2/aws-ec2-transitgateway.go
index 98903d3ff5..aa1557355b 100644
--- a/cloudformation/ec2/aws-ec2-transitgateway.go
+++ b/cloudformation/ec2/aws-ec2-transitgateway.go
@@ -59,6 +59,11 @@ type TransitGateway struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-propagationdefaultroutetableid
 	PropagationDefaultRouteTableId *string `json:"PropagationDefaultRouteTableId,omitempty"`
 
+	// SecurityGroupReferencingSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-securitygroupreferencingsupport
+	SecurityGroupReferencingSupport *string `json:"SecurityGroupReferencingSupport,omitempty"`
+
 	// Tags AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-tags
diff --git a/cloudformation/ec2/aws-ec2-transitgatewayroute.go b/cloudformation/ec2/aws-ec2-transitgatewayroute.go
index e8c10d640b..782f7b79aa 100644
--- a/cloudformation/ec2/aws-ec2-transitgatewayroute.go
+++ b/cloudformation/ec2/aws-ec2-transitgatewayroute.go
@@ -19,9 +19,9 @@ type TransitGatewayRoute struct {
 	Blackhole *bool `json:"Blackhole,omitempty"`
 
 	// DestinationCidrBlock AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html#cfn-ec2-transitgatewayroute-destinationcidrblock
-	DestinationCidrBlock *string `json:"DestinationCidrBlock,omitempty"`
+	DestinationCidrBlock string `json:"DestinationCidrBlock"`
 
 	// TransitGatewayAttachmentId AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment_options.go b/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment_options.go
index d01b720da4..1fc34c9d23 100644
--- a/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment_options.go
+++ b/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment_options.go
@@ -25,6 +25,11 @@ type TransitGatewayVpcAttachment_Options struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-transitgatewayvpcattachment-options.html#cfn-ec2-transitgatewayvpcattachment-options-ipv6support
 	Ipv6Support *string `json:"Ipv6Support,omitempty"`
 
+	// SecurityGroupReferencingSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-transitgatewayvpcattachment-options.html#cfn-ec2-transitgatewayvpcattachment-options-securitygroupreferencingsupport
+	SecurityGroupReferencingSupport *string `json:"SecurityGroupReferencingSupport,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/ec2/aws-ec2-vpnconnection.go b/cloudformation/ec2/aws-ec2-vpnconnection.go
index 22db881215..f74d28f3f0 100644
--- a/cloudformation/ec2/aws-ec2-vpnconnection.go
+++ b/cloudformation/ec2/aws-ec2-vpnconnection.go
@@ -19,6 +19,36 @@ type VPNConnection struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-customergatewayid
 	CustomerGatewayId string `json:"CustomerGatewayId"`
 
+	// EnableAcceleration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-enableacceleration
+	EnableAcceleration *bool `json:"EnableAcceleration,omitempty"`
+
+	// LocalIpv4NetworkCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-localipv4networkcidr
+	LocalIpv4NetworkCidr *string `json:"LocalIpv4NetworkCidr,omitempty"`
+
+	// LocalIpv6NetworkCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-localipv6networkcidr
+	LocalIpv6NetworkCidr *string `json:"LocalIpv6NetworkCidr,omitempty"`
+
+	// OutsideIpAddressType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-outsideipaddresstype
+	OutsideIpAddressType *string `json:"OutsideIpAddressType,omitempty"`
+
+	// RemoteIpv4NetworkCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-remoteipv4networkcidr
+	RemoteIpv4NetworkCidr *string `json:"RemoteIpv4NetworkCidr,omitempty"`
+
+	// RemoteIpv6NetworkCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-remoteipv6networkcidr
+	RemoteIpv6NetworkCidr *string `json:"RemoteIpv6NetworkCidr,omitempty"`
+
 	// StaticRoutesOnly AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-staticroutesonly
@@ -34,6 +64,16 @@ type VPNConnection struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-transitgatewayid
 	TransitGatewayId *string `json:"TransitGatewayId,omitempty"`
 
+	// TransportTransitGatewayAttachmentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-transporttransitgatewayattachmentid
+	TransportTransitGatewayAttachmentId *string `json:"TransportTransitGatewayAttachmentId,omitempty"`
+
+	// TunnelInsideIpVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-tunnelinsideipversion
+	TunnelInsideIpVersion *string `json:"TunnelInsideIpVersion,omitempty"`
+
 	// Type AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpnconnection.html#cfn-ec2-vpnconnection-type
diff --git a/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go b/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
index 15627a5f46..c576f1b389 100644
--- a/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
+++ b/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
@@ -10,17 +10,17 @@ import (
 )
 
 // VPNGatewayRoutePropagation AWS CloudFormation Resource (AWS::EC2::VPNGatewayRoutePropagation)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpngatewayroutepropagation.html
 type VPNGatewayRoutePropagation struct {
 
 	// RouteTableIds AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.html#cfn-ec2-vpngatewayrouteprop-routetableids
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpngatewayroutepropagation.html#cfn-ec2-vpngatewayroutepropagation-routetableids
 	RouteTableIds []string `json:"RouteTableIds"`
 
 	// VpnGatewayId AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.html#cfn-ec2-vpngatewayrouteprop-vpngatewayid
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpngatewayroutepropagation.html#cfn-ec2-vpngatewayroutepropagation-vpngatewayid
 	VpnGatewayId string `json:"VpnGatewayId"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ecr/aws-ecr-repositorycreationtemplate.go b/cloudformation/ecr/aws-ecr-repositorycreationtemplate.go
index 93582675cd..2b529485d5 100644
--- a/cloudformation/ecr/aws-ecr-repositorycreationtemplate.go
+++ b/cloudformation/ecr/aws-ecr-repositorycreationtemplate.go
@@ -19,6 +19,11 @@ type RepositoryCreationTemplate struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repositorycreationtemplate.html#cfn-ecr-repositorycreationtemplate-appliedfor
 	AppliedFor []string `json:"AppliedFor"`
 
+	// CustomRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repositorycreationtemplate.html#cfn-ecr-repositorycreationtemplate-customrolearn
+	CustomRoleArn *string `json:"CustomRoleArn,omitempty"`
+
 	// Description AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repositorycreationtemplate.html#cfn-ecr-repositorycreationtemplate-description
diff --git a/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go b/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
index 45fe3f27c3..8400d3db38 100644
--- a/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
+++ b/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
@@ -15,6 +15,11 @@ type Cluster_ClusterConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-clusterconfiguration.html#cfn-ecs-cluster-clusterconfiguration-executecommandconfiguration
 	ExecuteCommandConfiguration *Cluster_ExecuteCommandConfiguration `json:"ExecuteCommandConfiguration,omitempty"`
 
+	// ManagedStorageConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-clusterconfiguration.html#cfn-ecs-cluster-clusterconfiguration-managedstorageconfiguration
+	ManagedStorageConfiguration *Cluster_ManagedStorageConfiguration `json:"ManagedStorageConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/ecs/aws-ecs-cluster_managedstorageconfiguration.go b/cloudformation/ecs/aws-ecs-cluster_managedstorageconfiguration.go
new file mode 100644
index 0000000000..f7d7757f64
--- /dev/null
+++ b/cloudformation/ecs/aws-ecs-cluster_managedstorageconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ecs
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ManagedStorageConfiguration AWS CloudFormation Resource (AWS::ECS::Cluster.ManagedStorageConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-managedstorageconfiguration.html
+type Cluster_ManagedStorageConfiguration struct {
+
+	// FargateEphemeralStorageKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-managedstorageconfiguration.html#cfn-ecs-cluster-managedstorageconfiguration-fargateephemeralstoragekmskeyid
+	FargateEphemeralStorageKmsKeyId *string `json:"FargateEphemeralStorageKmsKeyId,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-managedstorageconfiguration.html#cfn-ecs-cluster-managedstorageconfiguration-kmskeyid
+	KmsKeyId *string `json:"KmsKeyId,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 *Cluster_ManagedStorageConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::Cluster.ManagedStorageConfiguration"
+}
diff --git a/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go b/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
index dea657faf5..5a63c489fc 100644
--- a/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
+++ b/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
@@ -170,6 +170,11 @@ type TaskDefinition_ContainerDefinition struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinition.html#cfn-ecs-taskdefinition-containerdefinition-resourcerequirements
 	ResourceRequirements []TaskDefinition_ResourceRequirement `json:"ResourceRequirements,omitempty"`
 
+	// RestartPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinition.html#cfn-ecs-taskdefinition-containerdefinition-restartpolicy
+	RestartPolicy *TaskDefinition_RestartPolicy `json:"RestartPolicy,omitempty"`
+
 	// Secrets AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinition.html#cfn-ecs-taskdefinition-containerdefinition-secrets
diff --git a/cloudformation/ecs/aws-ecs-taskdefinition_restartpolicy.go b/cloudformation/ecs/aws-ecs-taskdefinition_restartpolicy.go
new file mode 100644
index 0000000000..74b8ab7790
--- /dev/null
+++ b/cloudformation/ecs/aws-ecs-taskdefinition_restartpolicy.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ecs
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// TaskDefinition_RestartPolicy AWS CloudFormation Resource (AWS::ECS::TaskDefinition.RestartPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-restartpolicy.html
+type TaskDefinition_RestartPolicy struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-restartpolicy.html#cfn-ecs-taskdefinition-restartpolicy-enabled
+	Enabled *bool `json:"Enabled,omitempty"`
+
+	// IgnoredExitCodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-restartpolicy.html#cfn-ecs-taskdefinition-restartpolicy-ignoredexitcodes
+	IgnoredExitCodes []int `json:"IgnoredExitCodes,omitempty"`
+
+	// RestartAttemptPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-restartpolicy.html#cfn-ecs-taskdefinition-restartpolicy-restartattemptperiod
+	RestartAttemptPeriod *int `json:"RestartAttemptPeriod,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 *TaskDefinition_RestartPolicy) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.RestartPolicy"
+}
diff --git a/cloudformation/eks/aws-eks-addon.go b/cloudformation/eks/aws-eks-addon.go
index dab0f84759..2681eff2e6 100644
--- a/cloudformation/eks/aws-eks-addon.go
+++ b/cloudformation/eks/aws-eks-addon.go
@@ -34,6 +34,11 @@ type Addon struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-configurationvalues
 	ConfigurationValues *string `json:"ConfigurationValues,omitempty"`
 
+	// PodIdentityAssociations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-podidentityassociations
+	PodIdentityAssociations []Addon_PodIdentityAssociation `json:"PodIdentityAssociations,omitempty"`
+
 	// PreserveOnDelete AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-preserveondelete
diff --git a/cloudformation/eks/aws-eks-addon_podidentityassociation.go b/cloudformation/eks/aws-eks-addon_podidentityassociation.go
new file mode 100644
index 0000000000..0695a10e34
--- /dev/null
+++ b/cloudformation/eks/aws-eks-addon_podidentityassociation.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package eks
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Addon_PodIdentityAssociation AWS CloudFormation Resource (AWS::EKS::Addon.PodIdentityAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-addon-podidentityassociation.html
+type Addon_PodIdentityAssociation struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-addon-podidentityassociation.html#cfn-eks-addon-podidentityassociation-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// ServiceAccount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-addon-podidentityassociation.html#cfn-eks-addon-podidentityassociation-serviceaccount
+	ServiceAccount string `json:"ServiceAccount"`
+
+	// 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 *Addon_PodIdentityAssociation) AWSCloudFormationType() string {
+	return "AWS::EKS::Addon.PodIdentityAssociation"
+}
diff --git a/cloudformation/eks/aws-eks-cluster.go b/cloudformation/eks/aws-eks-cluster.go
index eda5315dd3..c653ce3dcb 100644
--- a/cloudformation/eks/aws-eks-cluster.go
+++ b/cloudformation/eks/aws-eks-cluster.go
@@ -19,6 +19,11 @@ type Cluster struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-accessconfig
 	AccessConfig *Cluster_AccessConfig `json:"AccessConfig,omitempty"`
 
+	// BootstrapSelfManagedAddons AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-bootstrapselfmanagedaddons
+	BootstrapSelfManagedAddons *bool `json:"BootstrapSelfManagedAddons,omitempty"`
+
 	// EncryptionConfig AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-encryptionconfig
@@ -59,11 +64,21 @@ type Cluster struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-tags
 	Tags []tags.Tag `json:"Tags,omitempty"`
 
+	// UpgradePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-upgradepolicy
+	UpgradePolicy *Cluster_UpgradePolicy `json:"UpgradePolicy,omitempty"`
+
 	// Version AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-version
 	Version *string `json:"Version,omitempty"`
 
+	// ZonalShiftConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-zonalshiftconfig
+	ZonalShiftConfig *Cluster_ZonalShiftConfig `json:"ZonalShiftConfig,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/eks/aws-eks-cluster_upgradepolicy.go b/cloudformation/eks/aws-eks-cluster_upgradepolicy.go
new file mode 100644
index 0000000000..de6bfe19ed
--- /dev/null
+++ b/cloudformation/eks/aws-eks-cluster_upgradepolicy.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package eks
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_UpgradePolicy AWS CloudFormation Resource (AWS::EKS::Cluster.UpgradePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-upgradepolicy.html
+type Cluster_UpgradePolicy struct {
+
+	// SupportType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-upgradepolicy.html#cfn-eks-cluster-upgradepolicy-supporttype
+	SupportType *string `json:"SupportType,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 *Cluster_UpgradePolicy) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.UpgradePolicy"
+}
diff --git a/cloudformation/eks/aws-eks-cluster_zonalshiftconfig.go b/cloudformation/eks/aws-eks-cluster_zonalshiftconfig.go
new file mode 100644
index 0000000000..806334a84a
--- /dev/null
+++ b/cloudformation/eks/aws-eks-cluster_zonalshiftconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package eks
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ZonalShiftConfig AWS CloudFormation Resource (AWS::EKS::Cluster.ZonalShiftConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-zonalshiftconfig.html
+type Cluster_ZonalShiftConfig struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-zonalshiftconfig.html#cfn-eks-cluster-zonalshiftconfig-enabled
+	Enabled *bool `json:"Enabled,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 *Cluster_ZonalShiftConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.ZonalShiftConfig"
+}
diff --git a/cloudformation/elasticache/aws-elasticache-parametergroup.go b/cloudformation/elasticache/aws-elasticache-parametergroup.go
index fe2b5a4eac..fcd9e59a4f 100644
--- a/cloudformation/elasticache/aws-elasticache-parametergroup.go
+++ b/cloudformation/elasticache/aws-elasticache-parametergroup.go
@@ -11,27 +11,27 @@ import (
 )
 
 // ParameterGroup AWS CloudFormation Resource (AWS::ElastiCache::ParameterGroup)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-parametergroup.html
 type ParameterGroup struct {
 
 	// CacheParameterGroupFamily AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html#cfn-elasticache-parametergroup-cacheparametergroupfamily
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-parametergroup.html#cfn-elasticache-parametergroup-cacheparametergroupfamily
 	CacheParameterGroupFamily string `json:"CacheParameterGroupFamily"`
 
 	// Description AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html#cfn-elasticache-parametergroup-description
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-parametergroup.html#cfn-elasticache-parametergroup-description
 	Description string `json:"Description"`
 
 	// Properties AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html#cfn-elasticache-parametergroup-properties
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-parametergroup.html#cfn-elasticache-parametergroup-properties
 	Properties map[string]string `json:"Properties,omitempty"`
 
 	// Tags AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.html#cfn-elasticache-parametergroup-tags
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-parametergroup.html#cfn-elasticache-parametergroup-tags
 	Tags []tags.Tag `json:"Tags,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go b/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
index b0eadbb0c3..d94a5bb4de 100644
--- a/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
+++ b/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
@@ -28,6 +28,11 @@ type Listener struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-defaultactions
 	DefaultActions []Listener_Action `json:"DefaultActions"`
 
+	// ListenerAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-listenerattributes
+	ListenerAttributes []Listener_ListenerAttribute `json:"ListenerAttributes,omitempty"`
+
 	// LoadBalancerArn AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-loadbalancerarn
diff --git a/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_listenerattribute.go b/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_listenerattribute.go
new file mode 100644
index 0000000000..2c8241c01e
--- /dev/null
+++ b/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_listenerattribute.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package elasticloadbalancingv2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Listener_ListenerAttribute AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-listenerattribute.html
+type Listener_ListenerAttribute struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-listenerattribute.html#cfn-elasticloadbalancingv2-listener-listenerattribute-key
+	Key *string `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-listenerattribute.html#cfn-elasticloadbalancingv2-listener-listenerattribute-value
+	Value *string `json:"Value,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 *Listener_ListenerAttribute) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute"
+}
diff --git a/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go b/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
index de55a02618..2a7cb67b73 100644
--- a/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
+++ b/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
@@ -25,6 +25,11 @@ type Cluster_InstanceFleetConfig struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-name
 	Name *string `json:"Name,omitempty"`
 
+	// ResizeSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-resizespecifications
+	ResizeSpecifications *Cluster_InstanceFleetResizingSpecifications `json:"ResizeSpecifications,omitempty"`
+
 	// TargetOnDemandCapacity AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-targetondemandcapacity
diff --git a/cloudformation/emr/aws-emr-cluster_instancefleetresizingspecifications.go b/cloudformation/emr/aws-emr-cluster_instancefleetresizingspecifications.go
new file mode 100644
index 0000000000..87d04b4e7e
--- /dev/null
+++ b/cloudformation/emr/aws-emr-cluster_instancefleetresizingspecifications.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_InstanceFleetResizingSpecifications AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceFleetResizingSpecifications)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetresizingspecifications.html
+type Cluster_InstanceFleetResizingSpecifications struct {
+
+	// OnDemandResizeSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetresizingspecifications.html#cfn-elasticmapreduce-cluster-instancefleetresizingspecifications-ondemandresizespecification
+	OnDemandResizeSpecification *Cluster_OnDemandResizingSpecification `json:"OnDemandResizeSpecification,omitempty"`
+
+	// SpotResizeSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetresizingspecifications.html#cfn-elasticmapreduce-cluster-instancefleetresizingspecifications-spotresizespecification
+	SpotResizeSpecification *Cluster_SpotResizingSpecification `json:"SpotResizeSpecification,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 *Cluster_InstanceFleetResizingSpecifications) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.InstanceFleetResizingSpecifications"
+}
diff --git a/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go b/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
index 4ffb5f1eb6..b8c382c8e3 100644
--- a/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
+++ b/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
@@ -40,6 +40,11 @@ type Cluster_InstanceTypeConfig struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-instancetype
 	InstanceType string `json:"InstanceType"`
 
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-priority
+	Priority *float64 `json:"Priority,omitempty"`
+
 	// WeightedCapacity AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-weightedcapacity
diff --git a/cloudformation/emr/aws-emr-cluster_ondemandcapacityreservationoptions.go b/cloudformation/emr/aws-emr-cluster_ondemandcapacityreservationoptions.go
new file mode 100644
index 0000000000..d7c14d40be
--- /dev/null
+++ b/cloudformation/emr/aws-emr-cluster_ondemandcapacityreservationoptions.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_OnDemandCapacityReservationOptions AWS CloudFormation Resource (AWS::EMR::Cluster.OnDemandCapacityReservationOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandcapacityreservationoptions.html
+type Cluster_OnDemandCapacityReservationOptions struct {
+
+	// CapacityReservationPreference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandcapacityreservationoptions.html#cfn-elasticmapreduce-cluster-ondemandcapacityreservationoptions-capacityreservationpreference
+	CapacityReservationPreference *string `json:"CapacityReservationPreference,omitempty"`
+
+	// CapacityReservationResourceGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandcapacityreservationoptions.html#cfn-elasticmapreduce-cluster-ondemandcapacityreservationoptions-capacityreservationresourcegrouparn
+	CapacityReservationResourceGroupArn *string `json:"CapacityReservationResourceGroupArn,omitempty"`
+
+	// UsageStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandcapacityreservationoptions.html#cfn-elasticmapreduce-cluster-ondemandcapacityreservationoptions-usagestrategy
+	UsageStrategy *string `json:"UsageStrategy,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 *Cluster_OnDemandCapacityReservationOptions) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
+}
diff --git a/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go b/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
index 6051ec68ab..f9f9263bd3 100644
--- a/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
+++ b/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
@@ -15,6 +15,11 @@ type Cluster_OnDemandProvisioningSpecification struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandprovisioningspecification.html#cfn-elasticmapreduce-cluster-ondemandprovisioningspecification-allocationstrategy
 	AllocationStrategy string `json:"AllocationStrategy"`
 
+	// CapacityReservationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandprovisioningspecification.html#cfn-elasticmapreduce-cluster-ondemandprovisioningspecification-capacityreservationoptions
+	CapacityReservationOptions *Cluster_OnDemandCapacityReservationOptions `json:"CapacityReservationOptions,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/emr/aws-emr-cluster_ondemandresizingspecification.go b/cloudformation/emr/aws-emr-cluster_ondemandresizingspecification.go
new file mode 100644
index 0000000000..0af1cf0a5b
--- /dev/null
+++ b/cloudformation/emr/aws-emr-cluster_ondemandresizingspecification.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_OnDemandResizingSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.OnDemandResizingSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandresizingspecification.html
+type Cluster_OnDemandResizingSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandresizingspecification.html#cfn-elasticmapreduce-cluster-ondemandresizingspecification-allocationstrategy
+	AllocationStrategy *string `json:"AllocationStrategy,omitempty"`
+
+	// CapacityReservationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandresizingspecification.html#cfn-elasticmapreduce-cluster-ondemandresizingspecification-capacityreservationoptions
+	CapacityReservationOptions *Cluster_OnDemandCapacityReservationOptions `json:"CapacityReservationOptions,omitempty"`
+
+	// TimeoutDurationMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandresizingspecification.html#cfn-elasticmapreduce-cluster-ondemandresizingspecification-timeoutdurationminutes
+	TimeoutDurationMinutes *int `json:"TimeoutDurationMinutes,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 *Cluster_OnDemandResizingSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.OnDemandResizingSpecification"
+}
diff --git a/cloudformation/emr/aws-emr-cluster_spotresizingspecification.go b/cloudformation/emr/aws-emr-cluster_spotresizingspecification.go
new file mode 100644
index 0000000000..1ff2327b4f
--- /dev/null
+++ b/cloudformation/emr/aws-emr-cluster_spotresizingspecification.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_SpotResizingSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.SpotResizingSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotresizingspecification.html
+type Cluster_SpotResizingSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotresizingspecification.html#cfn-elasticmapreduce-cluster-spotresizingspecification-allocationstrategy
+	AllocationStrategy *string `json:"AllocationStrategy,omitempty"`
+
+	// TimeoutDurationMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotresizingspecification.html#cfn-elasticmapreduce-cluster-spotresizingspecification-timeoutdurationminutes
+	TimeoutDurationMinutes *int `json:"TimeoutDurationMinutes,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 *Cluster_SpotResizingSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.SpotResizingSpecification"
+}
diff --git a/cloudformation/emr/aws-emr-instancefleetconfig.go b/cloudformation/emr/aws-emr-instancefleetconfig.go
index 219910a492..0eb5ad4fc4 100644
--- a/cloudformation/emr/aws-emr-instancefleetconfig.go
+++ b/cloudformation/emr/aws-emr-instancefleetconfig.go
@@ -38,6 +38,11 @@ type InstanceFleetConfig struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-name
 	Name *string `json:"Name,omitempty"`
 
+	// ResizeSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-resizespecifications
+	ResizeSpecifications *InstanceFleetConfig_InstanceFleetResizingSpecifications `json:"ResizeSpecifications,omitempty"`
+
 	// TargetOnDemandCapacity AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-targetondemandcapacity
diff --git a/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetresizingspecifications.go b/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetresizingspecifications.go
new file mode 100644
index 0000000000..5852f7e7c1
--- /dev/null
+++ b/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetresizingspecifications.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// InstanceFleetConfig_InstanceFleetResizingSpecifications AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetresizingspecifications.html
+type InstanceFleetConfig_InstanceFleetResizingSpecifications struct {
+
+	// OnDemandResizeSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetresizingspecifications.html#cfn-elasticmapreduce-instancefleetconfig-instancefleetresizingspecifications-ondemandresizespecification
+	OnDemandResizeSpecification *InstanceFleetConfig_OnDemandResizingSpecification `json:"OnDemandResizeSpecification,omitempty"`
+
+	// SpotResizeSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetresizingspecifications.html#cfn-elasticmapreduce-instancefleetconfig-instancefleetresizingspecifications-spotresizespecification
+	SpotResizeSpecification *InstanceFleetConfig_SpotResizingSpecification `json:"SpotResizeSpecification,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 *InstanceFleetConfig_InstanceFleetResizingSpecifications) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications"
+}
diff --git a/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go b/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
index 0da8b3c25f..416e97dcf1 100644
--- a/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
+++ b/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
@@ -40,6 +40,11 @@ type InstanceFleetConfig_InstanceTypeConfig struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-instancetype
 	InstanceType string `json:"InstanceType"`
 
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-priority
+	Priority *float64 `json:"Priority,omitempty"`
+
 	// WeightedCapacity AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-weightedcapacity
diff --git a/cloudformation/emr/aws-emr-instancefleetconfig_ondemandcapacityreservationoptions.go b/cloudformation/emr/aws-emr-instancefleetconfig_ondemandcapacityreservationoptions.go
new file mode 100644
index 0000000000..88aed0ea4e
--- /dev/null
+++ b/cloudformation/emr/aws-emr-instancefleetconfig_ondemandcapacityreservationoptions.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// InstanceFleetConfig_OnDemandCapacityReservationOptions AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandcapacityreservationoptions.html
+type InstanceFleetConfig_OnDemandCapacityReservationOptions struct {
+
+	// CapacityReservationPreference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandcapacityreservationoptions.html#cfn-elasticmapreduce-instancefleetconfig-ondemandcapacityreservationoptions-capacityreservationpreference
+	CapacityReservationPreference *string `json:"CapacityReservationPreference,omitempty"`
+
+	// CapacityReservationResourceGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandcapacityreservationoptions.html#cfn-elasticmapreduce-instancefleetconfig-ondemandcapacityreservationoptions-capacityreservationresourcegrouparn
+	CapacityReservationResourceGroupArn *string `json:"CapacityReservationResourceGroupArn,omitempty"`
+
+	// UsageStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandcapacityreservationoptions.html#cfn-elasticmapreduce-instancefleetconfig-ondemandcapacityreservationoptions-usagestrategy
+	UsageStrategy *string `json:"UsageStrategy,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 *InstanceFleetConfig_OnDemandCapacityReservationOptions) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
+}
diff --git a/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go b/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
index 5d50c91f21..f44c3dabf4 100644
--- a/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
+++ b/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
@@ -15,6 +15,11 @@ type InstanceFleetConfig_OnDemandProvisioningSpecification struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification-allocationstrategy
 	AllocationStrategy string `json:"AllocationStrategy"`
 
+	// CapacityReservationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification-capacityreservationoptions
+	CapacityReservationOptions *InstanceFleetConfig_OnDemandCapacityReservationOptions `json:"CapacityReservationOptions,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/emr/aws-emr-instancefleetconfig_ondemandresizingspecification.go b/cloudformation/emr/aws-emr-instancefleetconfig_ondemandresizingspecification.go
new file mode 100644
index 0000000000..f3aaa20a3d
--- /dev/null
+++ b/cloudformation/emr/aws-emr-instancefleetconfig_ondemandresizingspecification.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// InstanceFleetConfig_OnDemandResizingSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandresizingspecification.html
+type InstanceFleetConfig_OnDemandResizingSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandresizingspecification.html#cfn-elasticmapreduce-instancefleetconfig-ondemandresizingspecification-allocationstrategy
+	AllocationStrategy *string `json:"AllocationStrategy,omitempty"`
+
+	// CapacityReservationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandresizingspecification.html#cfn-elasticmapreduce-instancefleetconfig-ondemandresizingspecification-capacityreservationoptions
+	CapacityReservationOptions *InstanceFleetConfig_OnDemandCapacityReservationOptions `json:"CapacityReservationOptions,omitempty"`
+
+	// TimeoutDurationMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandresizingspecification.html#cfn-elasticmapreduce-instancefleetconfig-ondemandresizingspecification-timeoutdurationminutes
+	TimeoutDurationMinutes *int `json:"TimeoutDurationMinutes,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 *InstanceFleetConfig_OnDemandResizingSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification"
+}
diff --git a/cloudformation/emr/aws-emr-instancefleetconfig_spotresizingspecification.go b/cloudformation/emr/aws-emr-instancefleetconfig_spotresizingspecification.go
new file mode 100644
index 0000000000..2b88c62d22
--- /dev/null
+++ b/cloudformation/emr/aws-emr-instancefleetconfig_spotresizingspecification.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emr
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// InstanceFleetConfig_SpotResizingSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.SpotResizingSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotresizingspecification.html
+type InstanceFleetConfig_SpotResizingSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotresizingspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotresizingspecification-allocationstrategy
+	AllocationStrategy *string `json:"AllocationStrategy,omitempty"`
+
+	// TimeoutDurationMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotresizingspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotresizingspecification-timeoutdurationminutes
+	TimeoutDurationMinutes *int `json:"TimeoutDurationMinutes,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 *InstanceFleetConfig_SpotResizingSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.SpotResizingSpecification"
+}
diff --git a/cloudformation/emrserverless/aws-emrserverless-application.go b/cloudformation/emrserverless/aws-emrserverless-application.go
index 1f883b78a2..1a35899456 100644
--- a/cloudformation/emrserverless/aws-emrserverless-application.go
+++ b/cloudformation/emrserverless/aws-emrserverless-application.go
@@ -39,6 +39,11 @@ type Application struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrserverless-application.html#cfn-emrserverless-application-initialcapacity
 	InitialCapacity []Application_InitialCapacityConfigKeyValuePair `json:"InitialCapacity,omitempty"`
 
+	// InteractiveConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrserverless-application.html#cfn-emrserverless-application-interactiveconfiguration
+	InteractiveConfiguration *Application_InteractiveConfiguration `json:"InteractiveConfiguration,omitempty"`
+
 	// MaximumCapacity AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrserverless-application.html#cfn-emrserverless-application-maximumcapacity
diff --git a/cloudformation/emrserverless/aws-emrserverless-application_interactiveconfiguration.go b/cloudformation/emrserverless/aws-emrserverless-application_interactiveconfiguration.go
new file mode 100644
index 0000000000..b32d1e1af9
--- /dev/null
+++ b/cloudformation/emrserverless/aws-emrserverless-application_interactiveconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package emrserverless
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_InteractiveConfiguration AWS CloudFormation Resource (AWS::EMRServerless::Application.InteractiveConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrserverless-application-interactiveconfiguration.html
+type Application_InteractiveConfiguration struct {
+
+	// LivyEndpointEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrserverless-application-interactiveconfiguration.html#cfn-emrserverless-application-interactiveconfiguration-livyendpointenabled
+	LivyEndpointEnabled *bool `json:"LivyEndpointEnabled,omitempty"`
+
+	// StudioEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrserverless-application-interactiveconfiguration.html#cfn-emrserverless-application-interactiveconfiguration-studioenabled
+	StudioEnabled *bool `json:"StudioEnabled,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 *Application_InteractiveConfiguration) AWSCloudFormationType() string {
+	return "AWS::EMRServerless::Application.InteractiveConfiguration"
+}
diff --git a/cloudformation/emrserverless/aws-emrserverless-application_workerconfiguration.go b/cloudformation/emrserverless/aws-emrserverless-application_workerconfiguration.go
index a260cfd9df..072d7e367a 100644
--- a/cloudformation/emrserverless/aws-emrserverless-application_workerconfiguration.go
+++ b/cloudformation/emrserverless/aws-emrserverless-application_workerconfiguration.go
@@ -20,6 +20,11 @@ type Application_WorkerConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrserverless-application-workerconfiguration.html#cfn-emrserverless-application-workerconfiguration-disk
 	Disk *string `json:"Disk,omitempty"`
 
+	// DiskType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrserverless-application-workerconfiguration.html#cfn-emrserverless-application-workerconfiguration-disktype
+	DiskType *string `json:"DiskType,omitempty"`
+
 	// Memory AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrserverless-application-workerconfiguration.html#cfn-emrserverless-application-workerconfiguration-memory
diff --git a/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingrulebasedproperties.go b/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingrulebasedproperties.go
new file mode 100644
index 0000000000..8f91e19632
--- /dev/null
+++ b/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingrulebasedproperties.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package entityresolution
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdMappingWorkflow_IdMappingRuleBasedProperties AWS CloudFormation Resource (AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingrulebasedproperties.html
+type IdMappingWorkflow_IdMappingRuleBasedProperties struct {
+
+	// AttributeMatchingModel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingrulebasedproperties.html#cfn-entityresolution-idmappingworkflow-idmappingrulebasedproperties-attributematchingmodel
+	AttributeMatchingModel string `json:"AttributeMatchingModel"`
+
+	// RecordMatchingModel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingrulebasedproperties.html#cfn-entityresolution-idmappingworkflow-idmappingrulebasedproperties-recordmatchingmodel
+	RecordMatchingModel string `json:"RecordMatchingModel"`
+
+	// RuleDefinitionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingrulebasedproperties.html#cfn-entityresolution-idmappingworkflow-idmappingrulebasedproperties-ruledefinitiontype
+	RuleDefinitionType *string `json:"RuleDefinitionType,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingrulebasedproperties.html#cfn-entityresolution-idmappingworkflow-idmappingrulebasedproperties-rules
+	Rules []IdMappingWorkflow_Rule `json:"Rules,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 *IdMappingWorkflow_IdMappingRuleBasedProperties) AWSCloudFormationType() string {
+	return "AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties"
+}
diff --git a/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingtechniques.go b/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingtechniques.go
index 2b5e37736f..1b765461d2 100644
--- a/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingtechniques.go
+++ b/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_idmappingtechniques.go
@@ -20,6 +20,11 @@ type IdMappingWorkflow_IdMappingTechniques struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingtechniques.html#cfn-entityresolution-idmappingworkflow-idmappingtechniques-providerproperties
 	ProviderProperties *IdMappingWorkflow_ProviderProperties `json:"ProviderProperties,omitempty"`
 
+	// RuleBasedProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-idmappingtechniques.html#cfn-entityresolution-idmappingworkflow-idmappingtechniques-rulebasedproperties
+	RuleBasedProperties *IdMappingWorkflow_IdMappingRuleBasedProperties `json:"RuleBasedProperties,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_rule.go b/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_rule.go
new file mode 100644
index 0000000000..10e1c92c5f
--- /dev/null
+++ b/cloudformation/entityresolution/aws-entityresolution-idmappingworkflow_rule.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package entityresolution
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdMappingWorkflow_Rule AWS CloudFormation Resource (AWS::EntityResolution::IdMappingWorkflow.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-rule.html
+type IdMappingWorkflow_Rule struct {
+
+	// MatchingKeys AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-rule.html#cfn-entityresolution-idmappingworkflow-rule-matchingkeys
+	MatchingKeys []string `json:"MatchingKeys"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idmappingworkflow-rule.html#cfn-entityresolution-idmappingworkflow-rule-rulename
+	RuleName string `json:"RuleName"`
+
+	// 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 *IdMappingWorkflow_Rule) AWSCloudFormationType() string {
+	return "AWS::EntityResolution::IdMappingWorkflow.Rule"
+}
diff --git a/cloudformation/entityresolution/aws-entityresolution-idnamespace_idnamespaceidmappingworkflowproperties.go b/cloudformation/entityresolution/aws-entityresolution-idnamespace_idnamespaceidmappingworkflowproperties.go
index 04bce730b8..0854a7c50e 100644
--- a/cloudformation/entityresolution/aws-entityresolution-idnamespace_idnamespaceidmappingworkflowproperties.go
+++ b/cloudformation/entityresolution/aws-entityresolution-idnamespace_idnamespaceidmappingworkflowproperties.go
@@ -20,6 +20,11 @@ type IdNamespace_IdNamespaceIdMappingWorkflowProperties struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-idnamespaceidmappingworkflowproperties.html#cfn-entityresolution-idnamespace-idnamespaceidmappingworkflowproperties-providerproperties
 	ProviderProperties *IdNamespace_NamespaceProviderProperties `json:"ProviderProperties,omitempty"`
 
+	// RuleBasedProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-idnamespaceidmappingworkflowproperties.html#cfn-entityresolution-idnamespace-idnamespaceidmappingworkflowproperties-rulebasedproperties
+	RuleBasedProperties *IdNamespace_NamespaceRuleBasedProperties `json:"RuleBasedProperties,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/entityresolution/aws-entityresolution-idnamespace_namespacerulebasedproperties.go b/cloudformation/entityresolution/aws-entityresolution-idnamespace_namespacerulebasedproperties.go
new file mode 100644
index 0000000000..63f8967d12
--- /dev/null
+++ b/cloudformation/entityresolution/aws-entityresolution-idnamespace_namespacerulebasedproperties.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package entityresolution
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdNamespace_NamespaceRuleBasedProperties AWS CloudFormation Resource (AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-namespacerulebasedproperties.html
+type IdNamespace_NamespaceRuleBasedProperties struct {
+
+	// AttributeMatchingModel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-namespacerulebasedproperties.html#cfn-entityresolution-idnamespace-namespacerulebasedproperties-attributematchingmodel
+	AttributeMatchingModel *string `json:"AttributeMatchingModel,omitempty"`
+
+	// RecordMatchingModels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-namespacerulebasedproperties.html#cfn-entityresolution-idnamespace-namespacerulebasedproperties-recordmatchingmodels
+	RecordMatchingModels []string `json:"RecordMatchingModels,omitempty"`
+
+	// RuleDefinitionTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-namespacerulebasedproperties.html#cfn-entityresolution-idnamespace-namespacerulebasedproperties-ruledefinitiontypes
+	RuleDefinitionTypes []string `json:"RuleDefinitionTypes,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-namespacerulebasedproperties.html#cfn-entityresolution-idnamespace-namespacerulebasedproperties-rules
+	Rules []IdNamespace_Rule `json:"Rules,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 *IdNamespace_NamespaceRuleBasedProperties) AWSCloudFormationType() string {
+	return "AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties"
+}
diff --git a/cloudformation/entityresolution/aws-entityresolution-idnamespace_rule.go b/cloudformation/entityresolution/aws-entityresolution-idnamespace_rule.go
new file mode 100644
index 0000000000..e1c719f3ee
--- /dev/null
+++ b/cloudformation/entityresolution/aws-entityresolution-idnamespace_rule.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package entityresolution
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// IdNamespace_Rule AWS CloudFormation Resource (AWS::EntityResolution::IdNamespace.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-rule.html
+type IdNamespace_Rule struct {
+
+	// MatchingKeys AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-rule.html#cfn-entityresolution-idnamespace-rule-matchingkeys
+	MatchingKeys []string `json:"MatchingKeys"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-idnamespace-rule.html#cfn-entityresolution-idnamespace-rule-rulename
+	RuleName string `json:"RuleName"`
+
+	// 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 *IdNamespace_Rule) AWSCloudFormationType() string {
+	return "AWS::EntityResolution::IdNamespace.Rule"
+}
diff --git a/cloudformation/entityresolution/aws-entityresolution-matchingworkflow.go b/cloudformation/entityresolution/aws-entityresolution-matchingworkflow.go
index 3af526a713..791bdb4297 100644
--- a/cloudformation/entityresolution/aws-entityresolution-matchingworkflow.go
+++ b/cloudformation/entityresolution/aws-entityresolution-matchingworkflow.go
@@ -19,6 +19,11 @@ type MatchingWorkflow struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-matchingworkflow.html#cfn-entityresolution-matchingworkflow-description
 	Description *string `json:"Description,omitempty"`
 
+	// IncrementalRunConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-matchingworkflow.html#cfn-entityresolution-matchingworkflow-incrementalrunconfig
+	IncrementalRunConfig *MatchingWorkflow_IncrementalRunConfig `json:"IncrementalRunConfig,omitempty"`
+
 	// InputSourceConfig AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-entityresolution-matchingworkflow.html#cfn-entityresolution-matchingworkflow-inputsourceconfig
diff --git a/cloudformation/entityresolution/aws-entityresolution-matchingworkflow_incrementalrunconfig.go b/cloudformation/entityresolution/aws-entityresolution-matchingworkflow_incrementalrunconfig.go
new file mode 100644
index 0000000000..400e3d416f
--- /dev/null
+++ b/cloudformation/entityresolution/aws-entityresolution-matchingworkflow_incrementalrunconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package entityresolution
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MatchingWorkflow_IncrementalRunConfig AWS CloudFormation Resource (AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-incrementalrunconfig.html
+type MatchingWorkflow_IncrementalRunConfig struct {
+
+	// IncrementalRunType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-incrementalrunconfig.html#cfn-entityresolution-matchingworkflow-incrementalrunconfig-incrementalruntype
+	IncrementalRunType string `json:"IncrementalRunType"`
+
+	// 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 *MatchingWorkflow_IncrementalRunConfig) AWSCloudFormationType() string {
+	return "AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig"
+}
diff --git a/cloudformation/entityresolution/aws-entityresolution-matchingworkflow_rulebasedproperties.go b/cloudformation/entityresolution/aws-entityresolution-matchingworkflow_rulebasedproperties.go
index fff211a1d5..e11e4bb1fc 100644
--- a/cloudformation/entityresolution/aws-entityresolution-matchingworkflow_rulebasedproperties.go
+++ b/cloudformation/entityresolution/aws-entityresolution-matchingworkflow_rulebasedproperties.go
@@ -15,6 +15,11 @@ type MatchingWorkflow_RuleBasedProperties struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-rulebasedproperties.html#cfn-entityresolution-matchingworkflow-rulebasedproperties-attributematchingmodel
 	AttributeMatchingModel string `json:"AttributeMatchingModel"`
 
+	// MatchPurpose AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-rulebasedproperties.html#cfn-entityresolution-matchingworkflow-rulebasedproperties-matchpurpose
+	MatchPurpose *string `json:"MatchPurpose,omitempty"`
+
 	// Rules AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-matchingworkflow-rulebasedproperties.html#cfn-entityresolution-matchingworkflow-rulebasedproperties-rules
diff --git a/cloudformation/entityresolution/aws-entityresolution-schemamapping_schemainputattribute.go b/cloudformation/entityresolution/aws-entityresolution-schemamapping_schemainputattribute.go
index 0fafd00919..6dc8078767 100644
--- a/cloudformation/entityresolution/aws-entityresolution-schemamapping_schemainputattribute.go
+++ b/cloudformation/entityresolution/aws-entityresolution-schemamapping_schemainputattribute.go
@@ -20,6 +20,11 @@ type SchemaMapping_SchemaInputAttribute struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-schemamapping-schemainputattribute.html#cfn-entityresolution-schemamapping-schemainputattribute-groupname
 	GroupName *string `json:"GroupName,omitempty"`
 
+	// Hashed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-schemamapping-schemainputattribute.html#cfn-entityresolution-schemamapping-schemainputattribute-hashed
+	Hashed *bool `json:"Hashed,omitempty"`
+
 	// MatchKey AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-entityresolution-schemamapping-schemainputattribute.html#cfn-entityresolution-schemamapping-schemainputattribute-matchkey
diff --git a/cloudformation/events/aws-events-eventbus.go b/cloudformation/events/aws-events-eventbus.go
index 54d0a98a15..3c81a3962f 100644
--- a/cloudformation/events/aws-events-eventbus.go
+++ b/cloudformation/events/aws-events-eventbus.go
@@ -14,11 +14,26 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html
 type EventBus struct {
 
+	// DeadLetterConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html#cfn-events-eventbus-deadletterconfig
+	DeadLetterConfig *EventBus_DeadLetterConfig `json:"DeadLetterConfig,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html#cfn-events-eventbus-description
+	Description *string `json:"Description,omitempty"`
+
 	// EventSourceName AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html#cfn-events-eventbus-eventsourcename
 	EventSourceName *string `json:"EventSourceName,omitempty"`
 
+	// KmsKeyIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html#cfn-events-eventbus-kmskeyidentifier
+	KmsKeyIdentifier *string `json:"KmsKeyIdentifier,omitempty"`
+
 	// Name AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html#cfn-events-eventbus-name
diff --git a/cloudformation/events/aws-events-eventbus_deadletterconfig.go b/cloudformation/events/aws-events-eventbus_deadletterconfig.go
new file mode 100644
index 0000000000..0fb3d8dc03
--- /dev/null
+++ b/cloudformation/events/aws-events-eventbus_deadletterconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package events
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// EventBus_DeadLetterConfig AWS CloudFormation Resource (AWS::Events::EventBus.DeadLetterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-eventbus-deadletterconfig.html
+type EventBus_DeadLetterConfig struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-eventbus-deadletterconfig.html#cfn-events-eventbus-deadletterconfig-arn
+	Arn *string `json:"Arn,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 *EventBus_DeadLetterConfig) AWSCloudFormationType() string {
+	return "AWS::Events::EventBus.DeadLetterConfig"
+}
diff --git a/cloudformation/fms/aws-fms-policy_icmptypecode.go b/cloudformation/fms/aws-fms-policy_icmptypecode.go
new file mode 100644
index 0000000000..0e9defe3ba
--- /dev/null
+++ b/cloudformation/fms/aws-fms-policy_icmptypecode.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package fms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_IcmpTypeCode AWS CloudFormation Resource (AWS::FMS::Policy.IcmpTypeCode)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-icmptypecode.html
+type Policy_IcmpTypeCode struct {
+
+	// Code AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-icmptypecode.html#cfn-fms-policy-icmptypecode-code
+	Code int `json:"Code"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-icmptypecode.html#cfn-fms-policy-icmptypecode-type
+	Type int `json:"Type"`
+
+	// 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_IcmpTypeCode) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.IcmpTypeCode"
+}
diff --git a/cloudformation/fms/aws-fms-policy_networkaclcommonpolicy.go b/cloudformation/fms/aws-fms-policy_networkaclcommonpolicy.go
new file mode 100644
index 0000000000..f098029a63
--- /dev/null
+++ b/cloudformation/fms/aws-fms-policy_networkaclcommonpolicy.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package fms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_NetworkAclCommonPolicy AWS CloudFormation Resource (AWS::FMS::Policy.NetworkAclCommonPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclcommonpolicy.html
+type Policy_NetworkAclCommonPolicy struct {
+
+	// NetworkAclEntrySet AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclcommonpolicy.html#cfn-fms-policy-networkaclcommonpolicy-networkaclentryset
+	NetworkAclEntrySet *Policy_NetworkAclEntrySet `json:"NetworkAclEntrySet"`
+
+	// 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_NetworkAclCommonPolicy) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.NetworkAclCommonPolicy"
+}
diff --git a/cloudformation/fms/aws-fms-policy_networkaclentry.go b/cloudformation/fms/aws-fms-policy_networkaclentry.go
new file mode 100644
index 0000000000..2de9d9386d
--- /dev/null
+++ b/cloudformation/fms/aws-fms-policy_networkaclentry.go
@@ -0,0 +1,67 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package fms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_NetworkAclEntry AWS CloudFormation Resource (AWS::FMS::Policy.NetworkAclEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html
+type Policy_NetworkAclEntry struct {
+
+	// CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html#cfn-fms-policy-networkaclentry-cidrblock
+	CidrBlock *string `json:"CidrBlock,omitempty"`
+
+	// Egress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html#cfn-fms-policy-networkaclentry-egress
+	Egress bool `json:"Egress"`
+
+	// IcmpTypeCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html#cfn-fms-policy-networkaclentry-icmptypecode
+	IcmpTypeCode *Policy_IcmpTypeCode `json:"IcmpTypeCode,omitempty"`
+
+	// Ipv6CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html#cfn-fms-policy-networkaclentry-ipv6cidrblock
+	Ipv6CidrBlock *string `json:"Ipv6CidrBlock,omitempty"`
+
+	// PortRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html#cfn-fms-policy-networkaclentry-portrange
+	PortRange *Policy_PortRange `json:"PortRange,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html#cfn-fms-policy-networkaclentry-protocol
+	Protocol string `json:"Protocol"`
+
+	// RuleAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentry.html#cfn-fms-policy-networkaclentry-ruleaction
+	RuleAction string `json:"RuleAction"`
+
+	// 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_NetworkAclEntry) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.NetworkAclEntry"
+}
diff --git a/cloudformation/fms/aws-fms-policy_networkaclentryset.go b/cloudformation/fms/aws-fms-policy_networkaclentryset.go
new file mode 100644
index 0000000000..636dceb8c6
--- /dev/null
+++ b/cloudformation/fms/aws-fms-policy_networkaclentryset.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package fms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_NetworkAclEntrySet AWS CloudFormation Resource (AWS::FMS::Policy.NetworkAclEntrySet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentryset.html
+type Policy_NetworkAclEntrySet struct {
+
+	// FirstEntries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentryset.html#cfn-fms-policy-networkaclentryset-firstentries
+	FirstEntries []Policy_NetworkAclEntry `json:"FirstEntries,omitempty"`
+
+	// ForceRemediateForFirstEntries AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentryset.html#cfn-fms-policy-networkaclentryset-forceremediateforfirstentries
+	ForceRemediateForFirstEntries bool `json:"ForceRemediateForFirstEntries"`
+
+	// ForceRemediateForLastEntries AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentryset.html#cfn-fms-policy-networkaclentryset-forceremediateforlastentries
+	ForceRemediateForLastEntries bool `json:"ForceRemediateForLastEntries"`
+
+	// LastEntries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-networkaclentryset.html#cfn-fms-policy-networkaclentryset-lastentries
+	LastEntries []Policy_NetworkAclEntry `json:"LastEntries,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_NetworkAclEntrySet) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.NetworkAclEntrySet"
+}
diff --git a/cloudformation/fms/aws-fms-policy_policyoption.go b/cloudformation/fms/aws-fms-policy_policyoption.go
index 80b817d963..88c9ef8125 100644
--- a/cloudformation/fms/aws-fms-policy_policyoption.go
+++ b/cloudformation/fms/aws-fms-policy_policyoption.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-policyoption.html
 type Policy_PolicyOption struct {
 
+	// NetworkAclCommonPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-policyoption.html#cfn-fms-policy-policyoption-networkaclcommonpolicy
+	NetworkAclCommonPolicy *Policy_NetworkAclCommonPolicy `json:"NetworkAclCommonPolicy,omitempty"`
+
 	// NetworkFirewallPolicy AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-policyoption.html#cfn-fms-policy-policyoption-networkfirewallpolicy
diff --git a/cloudformation/fms/aws-fms-policy_portrange.go b/cloudformation/fms/aws-fms-policy_portrange.go
new file mode 100644
index 0000000000..2b6e907e77
--- /dev/null
+++ b/cloudformation/fms/aws-fms-policy_portrange.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package fms
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Policy_PortRange AWS CloudFormation Resource (AWS::FMS::Policy.PortRange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-portrange.html
+type Policy_PortRange struct {
+
+	// From AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-portrange.html#cfn-fms-policy-portrange-from
+	From int `json:"From"`
+
+	// To AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-portrange.html#cfn-fms-policy-portrange-to
+	To int `json:"To"`
+
+	// 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_PortRange) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.PortRange"
+}
diff --git a/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go b/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
index 61ca35967c..21cd57d216 100644
--- a/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
+++ b/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
@@ -60,6 +60,11 @@ type FileSystem_LustreConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-importedfilechunksize
 	ImportedFileChunkSize *int `json:"ImportedFileChunkSize,omitempty"`
 
+	// MetadataConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-metadataconfiguration
+	MetadataConfiguration *FileSystem_MetadataConfiguration `json:"MetadataConfiguration,omitempty"`
+
 	// PerUnitStorageThroughput AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-perunitstoragethroughput
diff --git a/cloudformation/fsx/aws-fsx-filesystem_metadataconfiguration.go b/cloudformation/fsx/aws-fsx-filesystem_metadataconfiguration.go
new file mode 100644
index 0000000000..43ab06a877
--- /dev/null
+++ b/cloudformation/fsx/aws-fsx-filesystem_metadataconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package fsx
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FileSystem_MetadataConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.MetadataConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration-metadataconfiguration.html
+type FileSystem_MetadataConfiguration struct {
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration-metadataconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-metadataconfiguration-iops
+	Iops *int `json:"Iops,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration-metadataconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-metadataconfiguration-mode
+	Mode *string `json:"Mode,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 *FileSystem_MetadataConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.MetadataConfiguration"
+}
diff --git a/cloudformation/globalaccelerator/aws-globalaccelerator-crossaccountattachment_resource.go b/cloudformation/globalaccelerator/aws-globalaccelerator-crossaccountattachment_resource.go
index b0f89abdce..68b74406cc 100644
--- a/cloudformation/globalaccelerator/aws-globalaccelerator-crossaccountattachment_resource.go
+++ b/cloudformation/globalaccelerator/aws-globalaccelerator-crossaccountattachment_resource.go
@@ -10,10 +10,15 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-crossaccountattachment-resource.html
 type CrossAccountAttachment_Resource struct {
 
+	// Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-crossaccountattachment-resource.html#cfn-globalaccelerator-crossaccountattachment-resource-cidr
+	Cidr *string `json:"Cidr,omitempty"`
+
 	// EndpointId AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-crossaccountattachment-resource.html#cfn-globalaccelerator-crossaccountattachment-resource-endpointid
-	EndpointId string `json:"EndpointId"`
+	EndpointId *string `json:"EndpointId,omitempty"`
 
 	// Region AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/glue/aws-glue-crawler_jdbctarget.go b/cloudformation/glue/aws-glue-crawler_jdbctarget.go
index 61f8f7e025..64259b3247 100644
--- a/cloudformation/glue/aws-glue-crawler_jdbctarget.go
+++ b/cloudformation/glue/aws-glue-crawler_jdbctarget.go
@@ -15,6 +15,11 @@ type Crawler_JdbcTarget struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-connectionname
 	ConnectionName *string `json:"ConnectionName,omitempty"`
 
+	// EnableAdditionalMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-enableadditionalmetadata
+	EnableAdditionalMetadata []string `json:"EnableAdditionalMetadata,omitempty"`
+
 	// Exclusions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-exclusions
diff --git a/cloudformation/glue/aws-glue-database.go b/cloudformation/glue/aws-glue-database.go
index e3f04156d2..5b0bac8c17 100644
--- a/cloudformation/glue/aws-glue-database.go
+++ b/cloudformation/glue/aws-glue-database.go
@@ -23,6 +23,11 @@ type Database struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput
 	DatabaseInput *Database_DatabaseInput `json:"DatabaseInput"`
 
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databasename
+	DatabaseName *string `json:"DatabaseName,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/glue/aws-glue-database_federateddatabase.go b/cloudformation/glue/aws-glue-database_federateddatabase.go
index 293bf1ebb2..26fa11c115 100644
--- a/cloudformation/glue/aws-glue-database_federateddatabase.go
+++ b/cloudformation/glue/aws-glue-database_federateddatabase.go
@@ -7,17 +7,17 @@ import (
 )
 
 // Database_FederatedDatabase AWS CloudFormation Resource (AWS::Glue::Database.FederatedDatabase)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput-federateddatabase.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-federateddatabase.html
 type Database_FederatedDatabase struct {
 
 	// ConnectionName AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput-federateddatabase.html#cfn-glue-database-databaseinput-federateddatabase-connectionname
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-federateddatabase.html#cfn-glue-database-federateddatabase-connectionname
 	ConnectionName *string `json:"ConnectionName,omitempty"`
 
 	// Identifier AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput-federateddatabase.html#cfn-glue-database-databaseinput-federateddatabase-identifier
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-federateddatabase.html#cfn-glue-database-federateddatabase-identifier
 	Identifier *string `json:"Identifier,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/glue/aws-glue-job.go b/cloudformation/glue/aws-glue-job.go
index bc993dd862..e13633adaf 100644
--- a/cloudformation/glue/aws-glue-job.go
+++ b/cloudformation/glue/aws-glue-job.go
@@ -53,11 +53,26 @@ type Job struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-glueversion
 	GlueVersion *string `json:"GlueVersion,omitempty"`
 
+	// JobMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-jobmode
+	JobMode *string `json:"JobMode,omitempty"`
+
+	// JobRunQueuingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-jobrunqueuingenabled
+	JobRunQueuingEnabled *bool `json:"JobRunQueuingEnabled,omitempty"`
+
 	// LogUri AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-loguri
 	LogUri *string `json:"LogUri,omitempty"`
 
+	// MaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maintenancewindow
+	MaintenanceWindow *string `json:"MaintenanceWindow,omitempty"`
+
 	// MaxCapacity AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxcapacity
diff --git a/cloudformation/glue/aws-glue-usageprofile.go b/cloudformation/glue/aws-glue-usageprofile.go
new file mode 100644
index 0000000000..e670009a18
--- /dev/null
+++ b/cloudformation/glue/aws-glue-usageprofile.go
@@ -0,0 +1,133 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// UsageProfile AWS CloudFormation Resource (AWS::Glue::UsageProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-usageprofile.html
+type UsageProfile struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-usageprofile.html#cfn-glue-usageprofile-configuration
+	Configuration *UsageProfile_ProfileConfiguration `json:"Configuration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-usageprofile.html#cfn-glue-usageprofile-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-usageprofile.html#cfn-glue-usageprofile-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-usageprofile.html#cfn-glue-usageprofile-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 *UsageProfile) AWSCloudFormationType() string {
+	return "AWS::Glue::UsageProfile"
+}
+
+// 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 UsageProfile) MarshalJSON() ([]byte, error) {
+	type Properties UsageProfile
+	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 *UsageProfile) UnmarshalJSON(b []byte) error {
+	type Properties UsageProfile
+	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 = UsageProfile(*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/glue/aws-glue-usageprofile_configurationobject.go b/cloudformation/glue/aws-glue-usageprofile_configurationobject.go
new file mode 100644
index 0000000000..c9c38afdcf
--- /dev/null
+++ b/cloudformation/glue/aws-glue-usageprofile_configurationobject.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package glue
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UsageProfile_ConfigurationObject AWS CloudFormation Resource (AWS::Glue::UsageProfile.ConfigurationObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-configurationobject.html
+type UsageProfile_ConfigurationObject struct {
+
+	// AllowedValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-configurationobject.html#cfn-glue-usageprofile-configurationobject-allowedvalues
+	AllowedValues []string `json:"AllowedValues,omitempty"`
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-configurationobject.html#cfn-glue-usageprofile-configurationobject-defaultvalue
+	DefaultValue *string `json:"DefaultValue,omitempty"`
+
+	// MaxValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-configurationobject.html#cfn-glue-usageprofile-configurationobject-maxvalue
+	MaxValue *string `json:"MaxValue,omitempty"`
+
+	// MinValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-configurationobject.html#cfn-glue-usageprofile-configurationobject-minvalue
+	MinValue *string `json:"MinValue,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 *UsageProfile_ConfigurationObject) AWSCloudFormationType() string {
+	return "AWS::Glue::UsageProfile.ConfigurationObject"
+}
diff --git a/cloudformation/glue/aws-glue-usageprofile_profileconfiguration.go b/cloudformation/glue/aws-glue-usageprofile_profileconfiguration.go
new file mode 100644
index 0000000000..572587db20
--- /dev/null
+++ b/cloudformation/glue/aws-glue-usageprofile_profileconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package glue
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UsageProfile_ProfileConfiguration AWS CloudFormation Resource (AWS::Glue::UsageProfile.ProfileConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-profileconfiguration.html
+type UsageProfile_ProfileConfiguration struct {
+
+	// JobConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-profileconfiguration.html#cfn-glue-usageprofile-profileconfiguration-jobconfiguration
+	JobConfiguration map[string]UsageProfile_ConfigurationObject `json:"JobConfiguration,omitempty"`
+
+	// SessionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-usageprofile-profileconfiguration.html#cfn-glue-usageprofile-profileconfiguration-sessionconfiguration
+	SessionConfiguration map[string]UsageProfile_ConfigurationObject `json:"SessionConfiguration,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 *UsageProfile_ProfileConfiguration) AWSCloudFormationType() string {
+	return "AWS::Glue::UsageProfile.ProfileConfiguration"
+}
diff --git a/cloudformation/guardduty/aws-guardduty-filter.go b/cloudformation/guardduty/aws-guardduty-filter.go
index b89e620bea..3b77bc0ef6 100644
--- a/cloudformation/guardduty/aws-guardduty-filter.go
+++ b/cloudformation/guardduty/aws-guardduty-filter.go
@@ -24,9 +24,9 @@ type Filter struct {
 	Description *string `json:"Description,omitempty"`
 
 	// DetectorId AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-detectorid
-	DetectorId *string `json:"DetectorId,omitempty"`
+	DetectorId string `json:"DetectorId"`
 
 	// FindingCriteria AWS CloudFormation Property
 	// Required: true
@@ -34,9 +34,9 @@ type Filter struct {
 	FindingCriteria *Filter_FindingCriteria `json:"FindingCriteria"`
 
 	// Name AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-name
-	Name *string `json:"Name,omitempty"`
+	Name string `json:"Name"`
 
 	// Rank AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/guardduty/aws-guardduty-malwareprotectionplan.go b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan.go
new file mode 100644
index 0000000000..5b0cf9b764
--- /dev/null
+++ b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package guardduty
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MalwareProtectionPlan AWS CloudFormation Resource (AWS::GuardDuty::MalwareProtectionPlan)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-malwareprotectionplan.html
+type MalwareProtectionPlan struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-malwareprotectionplan.html#cfn-guardduty-malwareprotectionplan-actions
+	Actions *MalwareProtectionPlan_CFNActions `json:"Actions,omitempty"`
+
+	// ProtectedResource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-malwareprotectionplan.html#cfn-guardduty-malwareprotectionplan-protectedresource
+	ProtectedResource *MalwareProtectionPlan_CFNProtectedResource `json:"ProtectedResource"`
+
+	// Role AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-malwareprotectionplan.html#cfn-guardduty-malwareprotectionplan-role
+	Role string `json:"Role"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-malwareprotectionplan.html#cfn-guardduty-malwareprotectionplan-tags
+	Tags []MalwareProtectionPlan_TagItem `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 *MalwareProtectionPlan) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::MalwareProtectionPlan"
+}
+
+// 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 MalwareProtectionPlan) MarshalJSON() ([]byte, error) {
+	type Properties MalwareProtectionPlan
+	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 *MalwareProtectionPlan) UnmarshalJSON(b []byte) error {
+	type Properties MalwareProtectionPlan
+	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 = MalwareProtectionPlan(*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/guardduty/aws-guardduty-malwareprotectionplan_cfnactions.go b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnactions.go
new file mode 100644
index 0000000000..9404e5e664
--- /dev/null
+++ b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnactions.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package guardduty
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MalwareProtectionPlan_CFNActions AWS CloudFormation Resource (AWS::GuardDuty::MalwareProtectionPlan.CFNActions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfnactions.html
+type MalwareProtectionPlan_CFNActions struct {
+
+	// Tagging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfnactions.html#cfn-guardduty-malwareprotectionplan-cfnactions-tagging
+	Tagging *MalwareProtectionPlan_CFNTagging `json:"Tagging,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 *MalwareProtectionPlan_CFNActions) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::MalwareProtectionPlan.CFNActions"
+}
diff --git a/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnprotectedresource.go b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnprotectedresource.go
new file mode 100644
index 0000000000..081353aecf
--- /dev/null
+++ b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnprotectedresource.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package guardduty
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MalwareProtectionPlan_CFNProtectedResource AWS CloudFormation Resource (AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfnprotectedresource.html
+type MalwareProtectionPlan_CFNProtectedResource struct {
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfnprotectedresource.html#cfn-guardduty-malwareprotectionplan-cfnprotectedresource-s3bucket
+	S3Bucket *MalwareProtectionPlan_S3Bucket `json:"S3Bucket"`
+
+	// 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 *MalwareProtectionPlan_CFNProtectedResource) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource"
+}
diff --git a/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnstatusreasons.go b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnstatusreasons.go
new file mode 100644
index 0000000000..bdded436bd
--- /dev/null
+++ b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfnstatusreasons.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package guardduty
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MalwareProtectionPlan_CFNStatusReasons AWS CloudFormation Resource (AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfnstatusreasons.html
+type MalwareProtectionPlan_CFNStatusReasons struct {
+
+	// Code AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfnstatusreasons.html#cfn-guardduty-malwareprotectionplan-cfnstatusreasons-code
+	Code *string `json:"Code,omitempty"`
+
+	// Message AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfnstatusreasons.html#cfn-guardduty-malwareprotectionplan-cfnstatusreasons-message
+	Message *string `json:"Message,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 *MalwareProtectionPlan_CFNStatusReasons) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons"
+}
diff --git a/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfntagging.go b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfntagging.go
new file mode 100644
index 0000000000..5ed0125d4b
--- /dev/null
+++ b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_cfntagging.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package guardduty
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MalwareProtectionPlan_CFNTagging AWS CloudFormation Resource (AWS::GuardDuty::MalwareProtectionPlan.CFNTagging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfntagging.html
+type MalwareProtectionPlan_CFNTagging struct {
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-cfntagging.html#cfn-guardduty-malwareprotectionplan-cfntagging-status
+	Status *string `json:"Status,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 *MalwareProtectionPlan_CFNTagging) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::MalwareProtectionPlan.CFNTagging"
+}
diff --git a/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_s3bucket.go b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_s3bucket.go
new file mode 100644
index 0000000000..0e716b4ce0
--- /dev/null
+++ b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_s3bucket.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package guardduty
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MalwareProtectionPlan_S3Bucket AWS CloudFormation Resource (AWS::GuardDuty::MalwareProtectionPlan.S3Bucket)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-s3bucket.html
+type MalwareProtectionPlan_S3Bucket struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-s3bucket.html#cfn-guardduty-malwareprotectionplan-s3bucket-bucketname
+	BucketName *string `json:"BucketName,omitempty"`
+
+	// ObjectPrefixes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-s3bucket.html#cfn-guardduty-malwareprotectionplan-s3bucket-objectprefixes
+	ObjectPrefixes []string `json:"ObjectPrefixes,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 *MalwareProtectionPlan_S3Bucket) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::MalwareProtectionPlan.S3Bucket"
+}
diff --git a/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_tagitem.go b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_tagitem.go
new file mode 100644
index 0000000000..fd432ab170
--- /dev/null
+++ b/cloudformation/guardduty/aws-guardduty-malwareprotectionplan_tagitem.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package guardduty
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MalwareProtectionPlan_TagItem AWS CloudFormation Resource (AWS::GuardDuty::MalwareProtectionPlan.TagItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-tagitem.html
+type MalwareProtectionPlan_TagItem struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-tagitem.html#cfn-guardduty-malwareprotectionplan-tagitem-key
+	Key string `json:"Key"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-malwareprotectionplan-tagitem.html#cfn-guardduty-malwareprotectionplan-tagitem-value
+	Value string `json:"Value"`
+
+	// 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 *MalwareProtectionPlan_TagItem) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::MalwareProtectionPlan.TagItem"
+}
diff --git a/cloudformation/iam/aws-iam-oidcprovider.go b/cloudformation/iam/aws-iam-oidcprovider.go
index 03ccb79496..d11cc09310 100644
--- a/cloudformation/iam/aws-iam-oidcprovider.go
+++ b/cloudformation/iam/aws-iam-oidcprovider.go
@@ -25,9 +25,9 @@ type OIDCProvider struct {
 	Tags []tags.Tag `json:"Tags,omitempty"`
 
 	// ThumbprintList AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html#cfn-iam-oidcprovider-thumbprintlist
-	ThumbprintList []string `json:"ThumbprintList"`
+	ThumbprintList []string `json:"ThumbprintList,omitempty"`
 
 	// Url AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/inspectorv2/aws-inspectorv2-cisscanconfiguration.go b/cloudformation/inspectorv2/aws-inspectorv2-cisscanconfiguration.go
index 817a767f00..c825c0adca 100644
--- a/cloudformation/inspectorv2/aws-inspectorv2-cisscanconfiguration.go
+++ b/cloudformation/inspectorv2/aws-inspectorv2-cisscanconfiguration.go
@@ -14,19 +14,19 @@ import (
 type CisScanConfiguration struct {
 
 	// ScanName AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-cisscanconfiguration.html#cfn-inspectorv2-cisscanconfiguration-scanname
-	ScanName *string `json:"ScanName,omitempty"`
+	ScanName string `json:"ScanName"`
 
 	// Schedule AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-cisscanconfiguration.html#cfn-inspectorv2-cisscanconfiguration-schedule
-	Schedule *CisScanConfiguration_Schedule `json:"Schedule,omitempty"`
+	Schedule *CisScanConfiguration_Schedule `json:"Schedule"`
 
 	// SecurityLevel AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-cisscanconfiguration.html#cfn-inspectorv2-cisscanconfiguration-securitylevel
-	SecurityLevel *string `json:"SecurityLevel,omitempty"`
+	SecurityLevel string `json:"SecurityLevel"`
 
 	// Tags AWS CloudFormation Property
 	// Required: false
@@ -34,9 +34,9 @@ type CisScanConfiguration struct {
 	Tags map[string]string `json:"Tags,omitempty"`
 
 	// Targets AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspectorv2-cisscanconfiguration.html#cfn-inspectorv2-cisscanconfiguration-targets
-	Targets *CisScanConfiguration_CisTargets `json:"Targets,omitempty"`
+	Targets *CisScanConfiguration_CisTargets `json:"Targets"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/iot/aws-iot-domainconfiguration.go b/cloudformation/iot/aws-iot-domainconfiguration.go
index b66d65a578..9694c8d962 100644
--- a/cloudformation/iot/aws-iot-domainconfiguration.go
+++ b/cloudformation/iot/aws-iot-domainconfiguration.go
@@ -14,11 +14,26 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html
 type DomainConfiguration struct {
 
+	// ApplicationProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-applicationprotocol
+	ApplicationProtocol *string `json:"ApplicationProtocol,omitempty"`
+
+	// AuthenticationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-authenticationtype
+	AuthenticationType *string `json:"AuthenticationType,omitempty"`
+
 	// AuthorizerConfig AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-authorizerconfig
 	AuthorizerConfig *DomainConfiguration_AuthorizerConfig `json:"AuthorizerConfig,omitempty"`
 
+	// ClientCertificateConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-clientcertificateconfig
+	ClientCertificateConfig *DomainConfiguration_ClientCertificateConfig `json:"ClientCertificateConfig,omitempty"`
+
 	// DomainConfigurationName AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-domainconfigurationname
diff --git a/cloudformation/iot/aws-iot-domainconfiguration_clientcertificateconfig.go b/cloudformation/iot/aws-iot-domainconfiguration_clientcertificateconfig.go
new file mode 100644
index 0000000000..985dfe1e91
--- /dev/null
+++ b/cloudformation/iot/aws-iot-domainconfiguration_clientcertificateconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package iot
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DomainConfiguration_ClientCertificateConfig AWS CloudFormation Resource (AWS::IoT::DomainConfiguration.ClientCertificateConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-clientcertificateconfig.html
+type DomainConfiguration_ClientCertificateConfig struct {
+
+	// ClientCertificateCallbackArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-clientcertificateconfig.html#cfn-iot-domainconfiguration-clientcertificateconfig-clientcertificatecallbackarn
+	ClientCertificateCallbackArn *string `json:"ClientCertificateCallbackArn,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 *DomainConfiguration_ClientCertificateConfig) AWSCloudFormationType() string {
+	return "AWS::IoT::DomainConfiguration.ClientCertificateConfig"
+}
diff --git a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign.go b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign.go
index 0938268ba6..0841d7499b 100644
--- a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign.go
+++ b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign.go
@@ -15,9 +15,9 @@ import (
 type Campaign struct {
 
 	// Action AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-campaign.html#cfn-iotfleetwise-campaign-action
-	Action string `json:"Action"`
+	Action *string `json:"Action,omitempty"`
 
 	// CollectionScheme AWS CloudFormation Property
 	// Required: true
@@ -79,6 +79,11 @@ type Campaign struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-campaign.html#cfn-iotfleetwise-campaign-signalstocollect
 	SignalsToCollect []Campaign_SignalInformation `json:"SignalsToCollect,omitempty"`
 
+	// SignalsToFetch AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-campaign.html#cfn-iotfleetwise-campaign-signalstofetch
+	SignalsToFetch []Campaign_SignalFetchInformation `json:"SignalsToFetch,omitempty"`
+
 	// SpoolingMode AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleetwise-campaign.html#cfn-iotfleetwise-campaign-spoolingmode
diff --git a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_conditionbasedsignalfetchconfig.go b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_conditionbasedsignalfetchconfig.go
new file mode 100644
index 0000000000..a0a8c5a89b
--- /dev/null
+++ b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_conditionbasedsignalfetchconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package iotfleetwise
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Campaign_ConditionBasedSignalFetchConfig AWS CloudFormation Resource (AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-conditionbasedsignalfetchconfig.html
+type Campaign_ConditionBasedSignalFetchConfig struct {
+
+	// ConditionExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-conditionbasedsignalfetchconfig.html#cfn-iotfleetwise-campaign-conditionbasedsignalfetchconfig-conditionexpression
+	ConditionExpression string `json:"ConditionExpression"`
+
+	// TriggerMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-conditionbasedsignalfetchconfig.html#cfn-iotfleetwise-campaign-conditionbasedsignalfetchconfig-triggermode
+	TriggerMode string `json:"TriggerMode"`
+
+	// 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 *Campaign_ConditionBasedSignalFetchConfig) AWSCloudFormationType() string {
+	return "AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig"
+}
diff --git a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_datadestinationconfig.go b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_datadestinationconfig.go
index 82e9303a22..6b180fe5e7 100644
--- a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_datadestinationconfig.go
+++ b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_datadestinationconfig.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-datadestinationconfig.html
 type Campaign_DataDestinationConfig struct {
 
+	// MqttTopicConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-datadestinationconfig.html#cfn-iotfleetwise-campaign-datadestinationconfig-mqtttopicconfig
+	MqttTopicConfig *Campaign_MqttTopicConfig `json:"MqttTopicConfig,omitempty"`
+
 	// S3Config AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-datadestinationconfig.html#cfn-iotfleetwise-campaign-datadestinationconfig-s3config
diff --git a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_mqtttopicconfig.go b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_mqtttopicconfig.go
new file mode 100644
index 0000000000..5ef8bdb6a4
--- /dev/null
+++ b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_mqtttopicconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package iotfleetwise
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Campaign_MqttTopicConfig AWS CloudFormation Resource (AWS::IoTFleetWise::Campaign.MqttTopicConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-mqtttopicconfig.html
+type Campaign_MqttTopicConfig struct {
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-mqtttopicconfig.html#cfn-iotfleetwise-campaign-mqtttopicconfig-executionrolearn
+	ExecutionRoleArn string `json:"ExecutionRoleArn"`
+
+	// MqttTopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-mqtttopicconfig.html#cfn-iotfleetwise-campaign-mqtttopicconfig-mqtttopicarn
+	MqttTopicArn string `json:"MqttTopicArn"`
+
+	// 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 *Campaign_MqttTopicConfig) AWSCloudFormationType() string {
+	return "AWS::IoTFleetWise::Campaign.MqttTopicConfig"
+}
diff --git a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchconfig.go b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchconfig.go
new file mode 100644
index 0000000000..9a10d38399
--- /dev/null
+++ b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package iotfleetwise
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Campaign_SignalFetchConfig AWS CloudFormation Resource (AWS::IoTFleetWise::Campaign.SignalFetchConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchconfig.html
+type Campaign_SignalFetchConfig struct {
+
+	// ConditionBased AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchconfig.html#cfn-iotfleetwise-campaign-signalfetchconfig-conditionbased
+	ConditionBased *Campaign_ConditionBasedSignalFetchConfig `json:"ConditionBased,omitempty"`
+
+	// TimeBased AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchconfig.html#cfn-iotfleetwise-campaign-signalfetchconfig-timebased
+	TimeBased *Campaign_TimeBasedSignalFetchConfig `json:"TimeBased,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 *Campaign_SignalFetchConfig) AWSCloudFormationType() string {
+	return "AWS::IoTFleetWise::Campaign.SignalFetchConfig"
+}
diff --git a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchinformation.go b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchinformation.go
new file mode 100644
index 0000000000..2ed2ba37a7
--- /dev/null
+++ b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_signalfetchinformation.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package iotfleetwise
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Campaign_SignalFetchInformation AWS CloudFormation Resource (AWS::IoTFleetWise::Campaign.SignalFetchInformation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchinformation.html
+type Campaign_SignalFetchInformation struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchinformation.html#cfn-iotfleetwise-campaign-signalfetchinformation-actions
+	Actions []string `json:"Actions"`
+
+	// ConditionLanguageVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchinformation.html#cfn-iotfleetwise-campaign-signalfetchinformation-conditionlanguageversion
+	ConditionLanguageVersion *float64 `json:"ConditionLanguageVersion,omitempty"`
+
+	// FullyQualifiedName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchinformation.html#cfn-iotfleetwise-campaign-signalfetchinformation-fullyqualifiedname
+	FullyQualifiedName string `json:"FullyQualifiedName"`
+
+	// SignalFetchConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-signalfetchinformation.html#cfn-iotfleetwise-campaign-signalfetchinformation-signalfetchconfig
+	SignalFetchConfig *Campaign_SignalFetchConfig `json:"SignalFetchConfig"`
+
+	// 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 *Campaign_SignalFetchInformation) AWSCloudFormationType() string {
+	return "AWS::IoTFleetWise::Campaign.SignalFetchInformation"
+}
diff --git a/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_timebasedsignalfetchconfig.go b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_timebasedsignalfetchconfig.go
new file mode 100644
index 0000000000..a9fe889f10
--- /dev/null
+++ b/cloudformation/iotfleetwise/aws-iotfleetwise-campaign_timebasedsignalfetchconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package iotfleetwise
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Campaign_TimeBasedSignalFetchConfig AWS CloudFormation Resource (AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-timebasedsignalfetchconfig.html
+type Campaign_TimeBasedSignalFetchConfig struct {
+
+	// ExecutionFrequencyMs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotfleetwise-campaign-timebasedsignalfetchconfig.html#cfn-iotfleetwise-campaign-timebasedsignalfetchconfig-executionfrequencyms
+	ExecutionFrequencyMs float64 `json:"ExecutionFrequencyMs"`
+
+	// 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 *Campaign_TimeBasedSignalFetchConfig) AWSCloudFormationType() string {
+	return "AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig"
+}
diff --git a/cloudformation/ivs/aws-ivs-publickey.go b/cloudformation/ivs/aws-ivs-publickey.go
new file mode 100644
index 0000000000..772c847ed0
--- /dev/null
+++ b/cloudformation/ivs/aws-ivs-publickey.go
@@ -0,0 +1,128 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ivs
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// PublicKey AWS CloudFormation Resource (AWS::IVS::PublicKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-publickey.html
+type PublicKey struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-publickey.html#cfn-ivs-publickey-name
+	Name *string `json:"Name,omitempty"`
+
+	// PublicKeyMaterial AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-publickey.html#cfn-ivs-publickey-publickeymaterial
+	PublicKeyMaterial *string `json:"PublicKeyMaterial,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-publickey.html#cfn-ivs-publickey-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 *PublicKey) AWSCloudFormationType() string {
+	return "AWS::IVS::PublicKey"
+}
+
+// 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 PublicKey) MarshalJSON() ([]byte, error) {
+	type Properties PublicKey
+	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 *PublicKey) UnmarshalJSON(b []byte) error {
+	type Properties PublicKey
+	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 = PublicKey(*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/ivs/aws-ivs-stage.go b/cloudformation/ivs/aws-ivs-stage.go
index 1761f06382..985837fccf 100644
--- a/cloudformation/ivs/aws-ivs-stage.go
+++ b/cloudformation/ivs/aws-ivs-stage.go
@@ -14,6 +14,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-stage.html
 type Stage struct {
 
+	// AutoParticipantRecordingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-stage.html#cfn-ivs-stage-autoparticipantrecordingconfiguration
+	AutoParticipantRecordingConfiguration *Stage_AutoParticipantRecordingConfiguration `json:"AutoParticipantRecordingConfiguration,omitempty"`
+
 	// Name AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-stage.html#cfn-ivs-stage-name
diff --git a/cloudformation/ivs/aws-ivs-stage_autoparticipantrecordingconfiguration.go b/cloudformation/ivs/aws-ivs-stage_autoparticipantrecordingconfiguration.go
new file mode 100644
index 0000000000..3e9585691c
--- /dev/null
+++ b/cloudformation/ivs/aws-ivs-stage_autoparticipantrecordingconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ivs
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Stage_AutoParticipantRecordingConfiguration AWS CloudFormation Resource (AWS::IVS::Stage.AutoParticipantRecordingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-stage-autoparticipantrecordingconfiguration.html
+type Stage_AutoParticipantRecordingConfiguration struct {
+
+	// MediaTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-stage-autoparticipantrecordingconfiguration.html#cfn-ivs-stage-autoparticipantrecordingconfiguration-mediatypes
+	MediaTypes []string `json:"MediaTypes,omitempty"`
+
+	// StorageConfigurationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-stage-autoparticipantrecordingconfiguration.html#cfn-ivs-stage-autoparticipantrecordingconfiguration-storageconfigurationarn
+	StorageConfigurationArn string `json:"StorageConfigurationArn"`
+
+	// 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 *Stage_AutoParticipantRecordingConfiguration) AWSCloudFormationType() string {
+	return "AWS::IVS::Stage.AutoParticipantRecordingConfiguration"
+}
diff --git a/cloudformation/kinesis/aws-kinesis-resourcepolicy.go b/cloudformation/kinesis/aws-kinesis-resourcepolicy.go
new file mode 100644
index 0000000000..13626575bd
--- /dev/null
+++ b/cloudformation/kinesis/aws-kinesis-resourcepolicy.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kinesis
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ResourcePolicy AWS CloudFormation Resource (AWS::Kinesis::ResourcePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-resourcepolicy.html
+type ResourcePolicy struct {
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-resourcepolicy.html#cfn-kinesis-resourcepolicy-resourcearn
+	ResourceArn string `json:"ResourceArn"`
+
+	// ResourcePolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-resourcepolicy.html#cfn-kinesis-resourcepolicy-resourcepolicy
+	ResourcePolicy interface{} `json:"ResourcePolicy"`
+
+	// 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 *ResourcePolicy) AWSCloudFormationType() string {
+	return "AWS::Kinesis::ResourcePolicy"
+}
+
+// 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 ResourcePolicy) MarshalJSON() ([]byte, error) {
+	type Properties ResourcePolicy
+	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 *ResourcePolicy) UnmarshalJSON(b []byte) error {
+	type Properties ResourcePolicy
+	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 = ResourcePolicy(*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/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go b/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
index 5790c33712..4adec7f364 100644
--- a/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
+++ b/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
@@ -20,6 +20,11 @@ type Application_ApplicationConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html#cfn-kinesisanalyticsv2-application-applicationconfiguration-applicationsnapshotconfiguration
 	ApplicationSnapshotConfiguration *Application_ApplicationSnapshotConfiguration `json:"ApplicationSnapshotConfiguration,omitempty"`
 
+	// ApplicationSystemRollbackConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html#cfn-kinesisanalyticsv2-application-applicationconfiguration-applicationsystemrollbackconfiguration
+	ApplicationSystemRollbackConfiguration *Application_ApplicationSystemRollbackConfiguration `json:"ApplicationSystemRollbackConfiguration,omitempty"`
+
 	// EnvironmentProperties AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html#cfn-kinesisanalyticsv2-application-applicationconfiguration-environmentproperties
diff --git a/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsystemrollbackconfiguration.go b/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsystemrollbackconfiguration.go
new file mode 100644
index 0000000000..3d744eb71c
--- /dev/null
+++ b/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsystemrollbackconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kinesisanalyticsv2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_ApplicationSystemRollbackConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationsystemrollbackconfiguration.html
+type Application_ApplicationSystemRollbackConfiguration struct {
+
+	// RollbackEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationsystemrollbackconfiguration.html#cfn-kinesisanalyticsv2-application-applicationsystemrollbackconfiguration-rollbackenabled
+	RollbackEnabled bool `json:"RollbackEnabled"`
+
+	// 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 *Application_ApplicationSystemRollbackConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration"
+}
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
index 91373d9d42..a96cc239ea 100644
--- a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
@@ -54,6 +54,11 @@ type DeliveryStream struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration
 	HttpEndpointDestinationConfiguration *DeliveryStream_HttpEndpointDestinationConfiguration `json:"HttpEndpointDestinationConfiguration,omitempty"`
 
+	// IcebergDestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration
+	IcebergDestinationConfiguration *DeliveryStream_IcebergDestinationConfiguration `json:"IcebergDestinationConfiguration,omitempty"`
+
 	// KinesisStreamSourceConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_catalogconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_catalogconfiguration.go
new file mode 100644
index 0000000000..8ccd6cdec4
--- /dev/null
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_catalogconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kinesisfirehose
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DeliveryStream_CatalogConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-catalogconfiguration.html
+type DeliveryStream_CatalogConfiguration struct {
+
+	// CatalogArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-catalogconfiguration.html#cfn-kinesisfirehose-deliverystream-catalogconfiguration-catalogarn
+	CatalogArn *string `json:"CatalogArn,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 *DeliveryStream_CatalogConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration"
+}
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_destinationtableconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_destinationtableconfiguration.go
new file mode 100644
index 0000000000..8a160a2c17
--- /dev/null
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_destinationtableconfiguration.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kinesisfirehose
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DeliveryStream_DestinationTableConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-destinationtableconfiguration.html
+type DeliveryStream_DestinationTableConfiguration struct {
+
+	// DestinationDatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-destinationtableconfiguration.html#cfn-kinesisfirehose-deliverystream-destinationtableconfiguration-destinationdatabasename
+	DestinationDatabaseName string `json:"DestinationDatabaseName"`
+
+	// DestinationTableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-destinationtableconfiguration.html#cfn-kinesisfirehose-deliverystream-destinationtableconfiguration-destinationtablename
+	DestinationTableName string `json:"DestinationTableName"`
+
+	// S3ErrorOutputPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-destinationtableconfiguration.html#cfn-kinesisfirehose-deliverystream-destinationtableconfiguration-s3erroroutputprefix
+	S3ErrorOutputPrefix *string `json:"S3ErrorOutputPrefix,omitempty"`
+
+	// UniqueKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-destinationtableconfiguration.html#cfn-kinesisfirehose-deliverystream-destinationtableconfiguration-uniquekeys
+	UniqueKeys []string `json:"UniqueKeys,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 *DeliveryStream_DestinationTableConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration"
+}
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
index a86a51e6b8..4b7058133d 100644
--- a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
@@ -55,6 +55,11 @@ type DeliveryStream_HttpEndpointDestinationConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-s3configuration
 	S3Configuration *DeliveryStream_S3DestinationConfiguration `json:"S3Configuration"`
 
+	// SecretsManagerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-secretsmanagerconfiguration
+	SecretsManagerConfiguration *DeliveryStream_SecretsManagerConfiguration `json:"SecretsManagerConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_icebergdestinationconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_icebergdestinationconfiguration.go
new file mode 100644
index 0000000000..a4f49961d4
--- /dev/null
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_icebergdestinationconfiguration.go
@@ -0,0 +1,77 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kinesisfirehose
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DeliveryStream_IcebergDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html
+type DeliveryStream_IcebergDestinationConfiguration struct {
+
+	// BufferingHints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-bufferinghints
+	BufferingHints *DeliveryStream_BufferingHints `json:"BufferingHints,omitempty"`
+
+	// CatalogConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-catalogconfiguration
+	CatalogConfiguration *DeliveryStream_CatalogConfiguration `json:"CatalogConfiguration"`
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// DestinationTableConfigurationList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-destinationtableconfigurationlist
+	DestinationTableConfigurationList []DeliveryStream_DestinationTableConfiguration `json:"DestinationTableConfigurationList,omitempty"`
+
+	// ProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-processingconfiguration
+	ProcessingConfiguration *DeliveryStream_ProcessingConfiguration `json:"ProcessingConfiguration,omitempty"`
+
+	// RetryOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-retryoptions
+	RetryOptions *DeliveryStream_RetryOptions `json:"RetryOptions,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-rolearn
+	RoleARN string `json:"RoleARN"`
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-s3configuration
+	S3Configuration *DeliveryStream_S3DestinationConfiguration `json:"S3Configuration"`
+
+	// s3BackupMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-icebergdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-icebergdestinationconfiguration-s3backupmode
+	s3BackupMode *string `json:"s3BackupMode,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 *DeliveryStream_IcebergDestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration"
+}
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_msksourceconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_msksourceconfiguration.go
index 47950ba057..786b651d7a 100644
--- a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_msksourceconfiguration.go
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_msksourceconfiguration.go
@@ -20,6 +20,11 @@ type DeliveryStream_MSKSourceConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-msksourceconfiguration.html#cfn-kinesisfirehose-deliverystream-msksourceconfiguration-mskclusterarn
 	MSKClusterARN string `json:"MSKClusterARN"`
 
+	// ReadFromTimestamp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-msksourceconfiguration.html#cfn-kinesisfirehose-deliverystream-msksourceconfiguration-readfromtimestamp
+	ReadFromTimestamp *string `json:"ReadFromTimestamp,omitempty"`
+
 	// TopicName AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-msksourceconfiguration.html#cfn-kinesisfirehose-deliverystream-msksourceconfiguration-topicname
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
index e39caa2091..f55217466b 100644
--- a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
@@ -26,9 +26,9 @@ type DeliveryStream_RedshiftDestinationConfiguration struct {
 	CopyCommand *DeliveryStream_CopyCommand `json:"CopyCommand"`
 
 	// Password AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-password
-	Password string `json:"Password"`
+	Password *string `json:"Password,omitempty"`
 
 	// ProcessingConfiguration AWS CloudFormation Property
 	// Required: false
@@ -60,10 +60,15 @@ type DeliveryStream_RedshiftDestinationConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-s3configuration
 	S3Configuration *DeliveryStream_S3DestinationConfiguration `json:"S3Configuration"`
 
+	// SecretsManagerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-secretsmanagerconfiguration
+	SecretsManagerConfiguration *DeliveryStream_SecretsManagerConfiguration `json:"SecretsManagerConfiguration,omitempty"`
+
 	// Username AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-username
-	Username string `json:"Username"`
+	Username *string `json:"Username,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_secretsmanagerconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_secretsmanagerconfiguration.go
new file mode 100644
index 0000000000..11592b9ed8
--- /dev/null
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_secretsmanagerconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kinesisfirehose
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DeliveryStream_SecretsManagerConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-secretsmanagerconfiguration.html
+type DeliveryStream_SecretsManagerConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-secretsmanagerconfiguration.html#cfn-kinesisfirehose-deliverystream-secretsmanagerconfiguration-enabled
+	Enabled bool `json:"Enabled"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-secretsmanagerconfiguration.html#cfn-kinesisfirehose-deliverystream-secretsmanagerconfiguration-rolearn
+	RoleARN *string `json:"RoleARN,omitempty"`
+
+	// SecretARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-secretsmanagerconfiguration.html#cfn-kinesisfirehose-deliverystream-secretsmanagerconfiguration-secretarn
+	SecretARN *string `json:"SecretARN,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 *DeliveryStream_SecretsManagerConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+}
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakebufferinghints.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakebufferinghints.go
new file mode 100644
index 0000000000..b103a8baca
--- /dev/null
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakebufferinghints.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package kinesisfirehose
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DeliveryStream_SnowflakeBufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakebufferinghints.html
+type DeliveryStream_SnowflakeBufferingHints struct {
+
+	// IntervalInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakebufferinghints.html#cfn-kinesisfirehose-deliverystream-snowflakebufferinghints-intervalinseconds
+	IntervalInSeconds *int `json:"IntervalInSeconds,omitempty"`
+
+	// SizeInMBs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakebufferinghints.html#cfn-kinesisfirehose-deliverystream-snowflakebufferinghints-sizeinmbs
+	SizeInMBs *int `json:"SizeInMBs,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 *DeliveryStream_SnowflakeBufferingHints) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints"
+}
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakedestinationconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakedestinationconfiguration.go
index 4aa64af1d7..1fddf26668 100644
--- a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakedestinationconfiguration.go
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_snowflakedestinationconfiguration.go
@@ -15,6 +15,11 @@ type DeliveryStream_SnowflakeDestinationConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-accounturl
 	AccountUrl string `json:"AccountUrl"`
 
+	// BufferingHints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-bufferinghints
+	BufferingHints *DeliveryStream_SnowflakeBufferingHints `json:"BufferingHints,omitempty"`
+
 	// CloudWatchLoggingOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-cloudwatchloggingoptions
@@ -46,9 +51,9 @@ type DeliveryStream_SnowflakeDestinationConfiguration struct {
 	MetaDataColumnName *string `json:"MetaDataColumnName,omitempty"`
 
 	// PrivateKey AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-privatekey
-	PrivateKey string `json:"PrivateKey"`
+	PrivateKey *string `json:"PrivateKey,omitempty"`
 
 	// ProcessingConfiguration AWS CloudFormation Property
 	// Required: false
@@ -80,6 +85,11 @@ type DeliveryStream_SnowflakeDestinationConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-schema
 	Schema string `json:"Schema"`
 
+	// SecretsManagerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-secretsmanagerconfiguration
+	SecretsManagerConfiguration *DeliveryStream_SecretsManagerConfiguration `json:"SecretsManagerConfiguration,omitempty"`
+
 	// SnowflakeRoleConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-snowflakeroleconfiguration
@@ -96,9 +106,9 @@ type DeliveryStream_SnowflakeDestinationConfiguration struct {
 	Table string `json:"Table"`
 
 	// User AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-snowflakedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-snowflakedestinationconfiguration-user
-	User string `json:"User"`
+	User *string `json:"User,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
index 876a32c226..0232612515 100644
--- a/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
+++ b/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
@@ -36,9 +36,9 @@ type DeliveryStream_SplunkDestinationConfiguration struct {
 	HECEndpointType string `json:"HECEndpointType"`
 
 	// HECToken AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-hectoken
-	HECToken string `json:"HECToken"`
+	HECToken *string `json:"HECToken,omitempty"`
 
 	// ProcessingConfiguration AWS CloudFormation Property
 	// Required: false
@@ -60,6 +60,11 @@ type DeliveryStream_SplunkDestinationConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-s3configuration
 	S3Configuration *DeliveryStream_S3DestinationConfiguration `json:"S3Configuration"`
 
+	// SecretsManagerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-secretsmanagerconfiguration
+	SecretsManagerConfiguration *DeliveryStream_SecretsManagerConfiguration `json:"SecretsManagerConfiguration,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go b/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
index a53424e621..c804950dc2 100644
--- a/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
+++ b/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
@@ -11,9 +11,9 @@ import (
 type Alias_AliasRoutingConfiguration struct {
 
 	// AdditionalVersionWeights AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-aliasroutingconfiguration.html#cfn-lambda-alias-aliasroutingconfiguration-additionalversionweights
-	AdditionalVersionWeights []Alias_VersionWeight `json:"AdditionalVersionWeights"`
+	AdditionalVersionWeights []Alias_VersionWeight `json:"AdditionalVersionWeights,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/lambda/aws-lambda-codesigningconfig.go b/cloudformation/lambda/aws-lambda-codesigningconfig.go
index e003445afa..273d7cace4 100644
--- a/cloudformation/lambda/aws-lambda-codesigningconfig.go
+++ b/cloudformation/lambda/aws-lambda-codesigningconfig.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // CodeSigningConfig AWS CloudFormation Resource (AWS::Lambda::CodeSigningConfig)
@@ -28,6 +29,11 @@ type CodeSigningConfig struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-codesigningconfig.html#cfn-lambda-codesigningconfig-description
 	Description *string `json:"Description,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-codesigningconfig.html#cfn-lambda-codesigningconfig-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/lambda/aws-lambda-eventsourcemapping.go b/cloudformation/lambda/aws-lambda-eventsourcemapping.go
index 31c8f42411..43658b0c83 100644
--- a/cloudformation/lambda/aws-lambda-eventsourcemapping.go
+++ b/cloudformation/lambda/aws-lambda-eventsourcemapping.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // EventSourceMapping AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping)
@@ -63,6 +64,11 @@ type EventSourceMapping struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-functionresponsetypes
 	FunctionResponseTypes []string `json:"FunctionResponseTypes,omitempty"`
 
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-kmskeyarn
+	KmsKeyArn *string `json:"KmsKeyArn,omitempty"`
+
 	// MaximumBatchingWindowInSeconds AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-maximumbatchingwindowinseconds
@@ -118,6 +124,11 @@ type EventSourceMapping struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-startingpositiontimestamp
 	StartingPositionTimestamp *float64 `json:"StartingPositionTimestamp,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// Topics AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-topics
diff --git a/cloudformation/lambda/aws-lambda-function.go b/cloudformation/lambda/aws-lambda-function.go
index 835685a3e9..6c0bdebe33 100644
--- a/cloudformation/lambda/aws-lambda-function.go
+++ b/cloudformation/lambda/aws-lambda-function.go
@@ -94,6 +94,11 @@ type Function struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-packagetype
 	PackageType *string `json:"PackageType,omitempty"`
 
+	// RecursiveLoop AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-recursiveloop
+	RecursiveLoop *string `json:"RecursiveLoop,omitempty"`
+
 	// ReservedConcurrentExecutions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-reservedconcurrentexecutions
diff --git a/cloudformation/lambda/aws-lambda-function_code.go b/cloudformation/lambda/aws-lambda-function_code.go
index cf314a21f8..24bef6c770 100644
--- a/cloudformation/lambda/aws-lambda-function_code.go
+++ b/cloudformation/lambda/aws-lambda-function_code.go
@@ -30,6 +30,11 @@ type Function_Code struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3objectversion
 	S3ObjectVersion *string `json:"S3ObjectVersion,omitempty"`
 
+	// SourceKMSKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-sourcekmskeyarn
+	SourceKMSKeyArn *string `json:"SourceKMSKeyArn,omitempty"`
+
 	// ZipFile AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-zipfile
diff --git a/cloudformation/lambda/aws-lambda-version.go b/cloudformation/lambda/aws-lambda-version.go
index 7e1bea57ae..134ed3020b 100644
--- a/cloudformation/lambda/aws-lambda-version.go
+++ b/cloudformation/lambda/aws-lambda-version.go
@@ -28,6 +28,11 @@ type Version struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-functionname
 	FunctionName string `json:"FunctionName"`
 
+	// Policy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-policy
+	Policy interface{} `json:"Policy,omitempty"`
+
 	// ProvisionedConcurrencyConfig AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-provisionedconcurrencyconfig
diff --git a/cloudformation/launchwizard/aws-launchwizard-deployment.go b/cloudformation/launchwizard/aws-launchwizard-deployment.go
new file mode 100644
index 0000000000..09ac46f2e5
--- /dev/null
+++ b/cloudformation/launchwizard/aws-launchwizard-deployment.go
@@ -0,0 +1,137 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package launchwizard
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Deployment AWS CloudFormation Resource (AWS::LaunchWizard::Deployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-launchwizard-deployment.html
+type Deployment struct {
+
+	// DeploymentPatternName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-launchwizard-deployment.html#cfn-launchwizard-deployment-deploymentpatternname
+	DeploymentPatternName string `json:"DeploymentPatternName"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-launchwizard-deployment.html#cfn-launchwizard-deployment-name
+	Name string `json:"Name"`
+
+	// Specifications AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-launchwizard-deployment.html#cfn-launchwizard-deployment-specifications
+	Specifications map[string]string `json:"Specifications"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-launchwizard-deployment.html#cfn-launchwizard-deployment-tags
+	Tags []Deployment_Tags `json:"Tags,omitempty"`
+
+	// WorkloadName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-launchwizard-deployment.html#cfn-launchwizard-deployment-workloadname
+	WorkloadName string `json:"WorkloadName"`
+
+	// 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 *Deployment) AWSCloudFormationType() string {
+	return "AWS::LaunchWizard::Deployment"
+}
+
+// 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 Deployment) MarshalJSON() ([]byte, error) {
+	type Properties Deployment
+	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 *Deployment) UnmarshalJSON(b []byte) error {
+	type Properties Deployment
+	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 = Deployment(*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/launchwizard/aws-launchwizard-deployment_tags.go b/cloudformation/launchwizard/aws-launchwizard-deployment_tags.go
new file mode 100644
index 0000000000..09fff64bc7
--- /dev/null
+++ b/cloudformation/launchwizard/aws-launchwizard-deployment_tags.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package launchwizard
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Deployment_Tags AWS CloudFormation Resource (AWS::LaunchWizard::Deployment.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-launchwizard-deployment-tags.html
+type Deployment_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-launchwizard-deployment-tags.html#cfn-launchwizard-deployment-tags-key
+	Key string `json:"Key"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-launchwizard-deployment-tags.html#cfn-launchwizard-deployment-tags-value
+	Value *string `json:"Value,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 *Deployment_Tags) AWSCloudFormationType() string {
+	return "AWS::LaunchWizard::Deployment.Tags"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow.go b/cloudformation/mediaconnect/aws-mediaconnect-flow.go
index 2f43572b35..b79e4bcb35 100644
--- a/cloudformation/mediaconnect/aws-mediaconnect-flow.go
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow.go
@@ -18,6 +18,16 @@ type Flow struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-availabilityzone
 	AvailabilityZone *string `json:"AvailabilityZone,omitempty"`
 
+	// Maintenance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-maintenance
+	Maintenance *Flow_Maintenance `json:"Maintenance,omitempty"`
+
+	// MediaStreams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-mediastreams
+	MediaStreams []Flow_MediaStream `json:"MediaStreams,omitempty"`
+
 	// Name AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-name
@@ -33,6 +43,16 @@ type Flow struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-sourcefailoverconfig
 	SourceFailoverConfig *Flow_FailoverConfig `json:"SourceFailoverConfig,omitempty"`
 
+	// SourceMonitoringConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-sourcemonitoringconfig
+	SourceMonitoringConfig *Flow_SourceMonitoringConfig `json:"SourceMonitoringConfig,omitempty"`
+
+	// VpcInterfaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-vpcinterfaces
+	VpcInterfaces []Flow_VpcInterface `json:"VpcInterfaces,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_fmtp.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_fmtp.go
new file mode 100644
index 0000000000..44a77f7609
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_fmtp.go
@@ -0,0 +1,67 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_Fmtp AWS CloudFormation Resource (AWS::MediaConnect::Flow.Fmtp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html
+type Flow_Fmtp struct {
+
+	// ChannelOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html#cfn-mediaconnect-flow-fmtp-channelorder
+	ChannelOrder *string `json:"ChannelOrder,omitempty"`
+
+	// Colorimetry AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html#cfn-mediaconnect-flow-fmtp-colorimetry
+	Colorimetry *string `json:"Colorimetry,omitempty"`
+
+	// ExactFramerate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html#cfn-mediaconnect-flow-fmtp-exactframerate
+	ExactFramerate *string `json:"ExactFramerate,omitempty"`
+
+	// Par AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html#cfn-mediaconnect-flow-fmtp-par
+	Par *string `json:"Par,omitempty"`
+
+	// Range AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html#cfn-mediaconnect-flow-fmtp-range
+	Range *string `json:"Range,omitempty"`
+
+	// ScanMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html#cfn-mediaconnect-flow-fmtp-scanmode
+	ScanMode *string `json:"ScanMode,omitempty"`
+
+	// Tcs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-fmtp.html#cfn-mediaconnect-flow-fmtp-tcs
+	Tcs *string `json:"Tcs,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 *Flow_Fmtp) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.Fmtp"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_inputconfiguration.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_inputconfiguration.go
new file mode 100644
index 0000000000..77c0353205
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_inputconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_InputConfiguration AWS CloudFormation Resource (AWS::MediaConnect::Flow.InputConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-inputconfiguration.html
+type Flow_InputConfiguration struct {
+
+	// InputPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-inputconfiguration.html#cfn-mediaconnect-flow-inputconfiguration-inputport
+	InputPort int `json:"InputPort"`
+
+	// Interface AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-inputconfiguration.html#cfn-mediaconnect-flow-inputconfiguration-interface
+	Interface *Flow_Interface `json:"Interface"`
+
+	// 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 *Flow_InputConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.InputConfiguration"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_interface.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_interface.go
new file mode 100644
index 0000000000..35807f7b6d
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_interface.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_Interface AWS CloudFormation Resource (AWS::MediaConnect::Flow.Interface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-interface.html
+type Flow_Interface struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-interface.html#cfn-mediaconnect-flow-interface-name
+	Name string `json:"Name"`
+
+	// 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 *Flow_Interface) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.Interface"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_maintenance.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_maintenance.go
new file mode 100644
index 0000000000..ca65e73952
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_maintenance.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_Maintenance AWS CloudFormation Resource (AWS::MediaConnect::Flow.Maintenance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-maintenance.html
+type Flow_Maintenance struct {
+
+	// MaintenanceDay AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-maintenance.html#cfn-mediaconnect-flow-maintenance-maintenanceday
+	MaintenanceDay string `json:"MaintenanceDay"`
+
+	// MaintenanceStartHour AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-maintenance.html#cfn-mediaconnect-flow-maintenance-maintenancestarthour
+	MaintenanceStartHour string `json:"MaintenanceStartHour"`
+
+	// 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 *Flow_Maintenance) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.Maintenance"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastream.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastream.go
new file mode 100644
index 0000000000..87d62b82db
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastream.go
@@ -0,0 +1,72 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_MediaStream AWS CloudFormation Resource (AWS::MediaConnect::Flow.MediaStream)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html
+type Flow_MediaStream struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-attributes
+	Attributes *Flow_MediaStreamAttributes `json:"Attributes,omitempty"`
+
+	// ClockRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-clockrate
+	ClockRate *int `json:"ClockRate,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-description
+	Description *string `json:"Description,omitempty"`
+
+	// Fmt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-fmt
+	Fmt *int `json:"Fmt,omitempty"`
+
+	// MediaStreamId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-mediastreamid
+	MediaStreamId int `json:"MediaStreamId"`
+
+	// MediaStreamName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-mediastreamname
+	MediaStreamName string `json:"MediaStreamName"`
+
+	// MediaStreamType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-mediastreamtype
+	MediaStreamType string `json:"MediaStreamType"`
+
+	// VideoFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastream.html#cfn-mediaconnect-flow-mediastream-videoformat
+	VideoFormat *string `json:"VideoFormat,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 *Flow_MediaStream) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.MediaStream"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamattributes.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamattributes.go
new file mode 100644
index 0000000000..2b24ce1a74
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamattributes.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_MediaStreamAttributes AWS CloudFormation Resource (AWS::MediaConnect::Flow.MediaStreamAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastreamattributes.html
+type Flow_MediaStreamAttributes struct {
+
+	// Fmtp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastreamattributes.html#cfn-mediaconnect-flow-mediastreamattributes-fmtp
+	Fmtp *Flow_Fmtp `json:"Fmtp,omitempty"`
+
+	// Lang AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastreamattributes.html#cfn-mediaconnect-flow-mediastreamattributes-lang
+	Lang *string `json:"Lang,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 *Flow_MediaStreamAttributes) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.MediaStreamAttributes"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamsourceconfiguration.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamsourceconfiguration.go
new file mode 100644
index 0000000000..330c10d665
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_mediastreamsourceconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_MediaStreamSourceConfiguration AWS CloudFormation Resource (AWS::MediaConnect::Flow.MediaStreamSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastreamsourceconfiguration.html
+type Flow_MediaStreamSourceConfiguration struct {
+
+	// EncodingName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastreamsourceconfiguration.html#cfn-mediaconnect-flow-mediastreamsourceconfiguration-encodingname
+	EncodingName string `json:"EncodingName"`
+
+	// InputConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastreamsourceconfiguration.html#cfn-mediaconnect-flow-mediastreamsourceconfiguration-inputconfigurations
+	InputConfigurations []Flow_InputConfiguration `json:"InputConfigurations,omitempty"`
+
+	// MediaStreamName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-mediastreamsourceconfiguration.html#cfn-mediaconnect-flow-mediastreamsourceconfiguration-mediastreamname
+	MediaStreamName string `json:"MediaStreamName"`
+
+	// 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 *Flow_MediaStreamSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.MediaStreamSourceConfiguration"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
index 8d83e4037e..66dd4ddfc4 100644
--- a/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
@@ -50,6 +50,16 @@ type Flow_Source struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-maxlatency
 	MaxLatency *int `json:"MaxLatency,omitempty"`
 
+	// MaxSyncBuffer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-maxsyncbuffer
+	MaxSyncBuffer *int `json:"MaxSyncBuffer,omitempty"`
+
+	// MediaStreamSourceConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-mediastreamsourceconfigurations
+	MediaStreamSourceConfigurations []Flow_MediaStreamSourceConfiguration `json:"MediaStreamSourceConfigurations,omitempty"`
+
 	// MinLatency AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-minlatency
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_sourcemonitoringconfig.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_sourcemonitoringconfig.go
new file mode 100644
index 0000000000..232ab0a706
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_sourcemonitoringconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_SourceMonitoringConfig AWS CloudFormation Resource (AWS::MediaConnect::Flow.SourceMonitoringConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-sourcemonitoringconfig.html
+type Flow_SourceMonitoringConfig struct {
+
+	// ThumbnailState AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-sourcemonitoringconfig.html#cfn-mediaconnect-flow-sourcemonitoringconfig-thumbnailstate
+	ThumbnailState string `json:"ThumbnailState"`
+
+	// 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 *Flow_SourceMonitoringConfig) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.SourceMonitoringConfig"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flow_vpcinterface.go b/cloudformation/mediaconnect/aws-mediaconnect-flow_vpcinterface.go
new file mode 100644
index 0000000000..0f881dca7f
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flow_vpcinterface.go
@@ -0,0 +1,62 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Flow_VpcInterface AWS CloudFormation Resource (AWS::MediaConnect::Flow.VpcInterface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-vpcinterface.html
+type Flow_VpcInterface struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-vpcinterface.html#cfn-mediaconnect-flow-vpcinterface-name
+	Name string `json:"Name"`
+
+	// NetworkInterfaceIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-vpcinterface.html#cfn-mediaconnect-flow-vpcinterface-networkinterfaceids
+	NetworkInterfaceIds []string `json:"NetworkInterfaceIds,omitempty"`
+
+	// NetworkInterfaceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-vpcinterface.html#cfn-mediaconnect-flow-vpcinterface-networkinterfacetype
+	NetworkInterfaceType *string `json:"NetworkInterfaceType,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-vpcinterface.html#cfn-mediaconnect-flow-vpcinterface-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-vpcinterface.html#cfn-mediaconnect-flow-vpcinterface-securitygroupids
+	SecurityGroupIds []string `json:"SecurityGroupIds"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-vpcinterface.html#cfn-mediaconnect-flow-vpcinterface-subnetid
+	SubnetId string `json:"SubnetId"`
+
+	// 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 *Flow_VpcInterface) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.VpcInterface"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
index c2326c762c..ef4f5b78b8 100644
--- a/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
@@ -43,6 +43,11 @@ type FlowOutput struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-maxlatency
 	MaxLatency *int `json:"MaxLatency,omitempty"`
 
+	// MediaStreamOutputConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-mediastreamoutputconfigurations
+	MediaStreamOutputConfigurations []FlowOutput_MediaStreamOutputConfiguration `json:"MediaStreamOutputConfigurations,omitempty"`
+
 	// MinLatency AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-minlatency
@@ -53,6 +58,11 @@ type FlowOutput struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-name
 	Name *string `json:"Name,omitempty"`
 
+	// OutputStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-outputstatus
+	OutputStatus *string `json:"OutputStatus,omitempty"`
+
 	// Port AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-port
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_destinationconfiguration.go b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_destinationconfiguration.go
new file mode 100644
index 0000000000..6c612e809b
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_destinationconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowOutput_DestinationConfiguration AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.DestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-destinationconfiguration.html
+type FlowOutput_DestinationConfiguration struct {
+
+	// DestinationIp AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-destinationconfiguration.html#cfn-mediaconnect-flowoutput-destinationconfiguration-destinationip
+	DestinationIp string `json:"DestinationIp"`
+
+	// DestinationPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-destinationconfiguration.html#cfn-mediaconnect-flowoutput-destinationconfiguration-destinationport
+	DestinationPort int `json:"DestinationPort"`
+
+	// Interface AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-destinationconfiguration.html#cfn-mediaconnect-flowoutput-destinationconfiguration-interface
+	Interface *FlowOutput_Interface `json:"Interface"`
+
+	// 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 *FlowOutput_DestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowOutput.DestinationConfiguration"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encodingparameters.go b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encodingparameters.go
new file mode 100644
index 0000000000..34f0638afe
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encodingparameters.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowOutput_EncodingParameters AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.EncodingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encodingparameters.html
+type FlowOutput_EncodingParameters struct {
+
+	// CompressionFactor AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encodingparameters.html#cfn-mediaconnect-flowoutput-encodingparameters-compressionfactor
+	CompressionFactor float64 `json:"CompressionFactor"`
+
+	// EncoderProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encodingparameters.html#cfn-mediaconnect-flowoutput-encodingparameters-encoderprofile
+	EncoderProfile *string `json:"EncoderProfile,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 *FlowOutput_EncodingParameters) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowOutput.EncodingParameters"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_interface.go b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_interface.go
new file mode 100644
index 0000000000..1231779677
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_interface.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowOutput_Interface AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.Interface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-interface.html
+type FlowOutput_Interface struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-interface.html#cfn-mediaconnect-flowoutput-interface-name
+	Name string `json:"Name"`
+
+	// 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 *FlowOutput_Interface) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowOutput.Interface"
+}
diff --git a/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_mediastreamoutputconfiguration.go b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_mediastreamoutputconfiguration.go
new file mode 100644
index 0000000000..1ed623f331
--- /dev/null
+++ b/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_mediastreamoutputconfiguration.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediaconnect
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FlowOutput_MediaStreamOutputConfiguration AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-mediastreamoutputconfiguration.html
+type FlowOutput_MediaStreamOutputConfiguration struct {
+
+	// DestinationConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-mediastreamoutputconfiguration.html#cfn-mediaconnect-flowoutput-mediastreamoutputconfiguration-destinationconfigurations
+	DestinationConfigurations []FlowOutput_DestinationConfiguration `json:"DestinationConfigurations,omitempty"`
+
+	// EncodingName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-mediastreamoutputconfiguration.html#cfn-mediaconnect-flowoutput-mediastreamoutputconfiguration-encodingname
+	EncodingName string `json:"EncodingName"`
+
+	// EncodingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-mediastreamoutputconfiguration.html#cfn-mediaconnect-flowoutput-mediastreamoutputconfiguration-encodingparameters
+	EncodingParameters *FlowOutput_EncodingParameters `json:"EncodingParameters,omitempty"`
+
+	// MediaStreamName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-mediastreamoutputconfiguration.html#cfn-mediaconnect-flowoutput-mediastreamoutputconfiguration-mediastreamname
+	MediaStreamName string `json:"MediaStreamName"`
+
+	// 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 *FlowOutput_MediaStreamOutputConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration"
+}
diff --git a/cloudformation/medialive/aws-medialive-channel_availconfiguration.go b/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
index eedc8b43f2..591050d774 100644
--- a/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
+++ b/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
@@ -15,6 +15,11 @@ type Channel_AvailConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availconfiguration.html#cfn-medialive-channel-availconfiguration-availsettings
 	AvailSettings *Channel_AvailSettings `json:"AvailSettings,omitempty"`
 
+	// Scte35SegmentationScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availconfiguration.html#cfn-medialive-channel-availconfiguration-scte35segmentationscope
+	Scte35SegmentationScope *string `json:"Scte35SegmentationScope,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/medialive/aws-medialive-channel_h264settings.go b/cloudformation/medialive/aws-medialive-channel_h264settings.go
index 611733d8b7..7c7e54030f 100644
--- a/cloudformation/medialive/aws-medialive-channel_h264settings.go
+++ b/cloudformation/medialive/aws-medialive-channel_h264settings.go
@@ -130,6 +130,11 @@ type Channel_H264Settings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-miniinterval
 	MinIInterval *int `json:"MinIInterval,omitempty"`
 
+	// MinQp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-minqp
+	MinQp *int `json:"MinQp,omitempty"`
+
 	// NumRefFrames AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-numrefframes
diff --git a/cloudformation/medialive/aws-medialive-channel_h265settings.go b/cloudformation/medialive/aws-medialive-channel_h265settings.go
index 70ae24da07..166cbe4927 100644
--- a/cloudformation/medialive/aws-medialive-channel_h265settings.go
+++ b/cloudformation/medialive/aws-medialive-channel_h265settings.go
@@ -105,6 +105,11 @@ type Channel_H265Settings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-miniinterval
 	MinIInterval *int `json:"MinIInterval,omitempty"`
 
+	// MinQp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-minqp
+	MinQp *int `json:"MinQp,omitempty"`
+
 	// MvOverPictureBoundaries AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-mvoverpictureboundaries
diff --git a/cloudformation/medialive/aws-medialive-channelplacementgroup.go b/cloudformation/medialive/aws-medialive-channelplacementgroup.go
new file mode 100644
index 0000000000..08ca994353
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-channelplacementgroup.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ChannelPlacementGroup AWS CloudFormation Resource (AWS::MediaLive::ChannelPlacementGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channelplacementgroup.html
+type ChannelPlacementGroup struct {
+
+	// ClusterId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channelplacementgroup.html#cfn-medialive-channelplacementgroup-clusterid
+	ClusterId *string `json:"ClusterId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channelplacementgroup.html#cfn-medialive-channelplacementgroup-name
+	Name *string `json:"Name,omitempty"`
+
+	// Nodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channelplacementgroup.html#cfn-medialive-channelplacementgroup-nodes
+	Nodes []string `json:"Nodes,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channelplacementgroup.html#cfn-medialive-channelplacementgroup-tags
+	Tags []ChannelPlacementGroup_Tags `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 *ChannelPlacementGroup) AWSCloudFormationType() string {
+	return "AWS::MediaLive::ChannelPlacementGroup"
+}
+
+// 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 ChannelPlacementGroup) MarshalJSON() ([]byte, error) {
+	type Properties ChannelPlacementGroup
+	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 *ChannelPlacementGroup) UnmarshalJSON(b []byte) error {
+	type Properties ChannelPlacementGroup
+	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 = ChannelPlacementGroup(*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/medialive/aws-medialive-channelplacementgroup_tags.go b/cloudformation/medialive/aws-medialive-channelplacementgroup_tags.go
new file mode 100644
index 0000000000..970956e0b4
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-channelplacementgroup_tags.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ChannelPlacementGroup_Tags AWS CloudFormation Resource (AWS::MediaLive::ChannelPlacementGroup.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channelplacementgroup-tags.html
+type ChannelPlacementGroup_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channelplacementgroup-tags.html#cfn-medialive-channelplacementgroup-tags-key
+	Key *string `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channelplacementgroup-tags.html#cfn-medialive-channelplacementgroup-tags-value
+	Value *string `json:"Value,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 *ChannelPlacementGroup_Tags) AWSCloudFormationType() string {
+	return "AWS::MediaLive::ChannelPlacementGroup.Tags"
+}
diff --git a/cloudformation/medialive/aws-medialive-cloudwatchalarmtemplate.go b/cloudformation/medialive/aws-medialive-cloudwatchalarmtemplate.go
new file mode 100644
index 0000000000..f1b6572673
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-cloudwatchalarmtemplate.go
@@ -0,0 +1,177 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// CloudWatchAlarmTemplate AWS CloudFormation Resource (AWS::MediaLive::CloudWatchAlarmTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html
+type CloudWatchAlarmTemplate struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-comparisonoperator
+	ComparisonOperator string `json:"ComparisonOperator"`
+
+	// DatapointsToAlarm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-datapointstoalarm
+	DatapointsToAlarm *float64 `json:"DatapointsToAlarm,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-description
+	Description *string `json:"Description,omitempty"`
+
+	// EvaluationPeriods AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-evaluationperiods
+	EvaluationPeriods float64 `json:"EvaluationPeriods"`
+
+	// GroupIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-groupidentifier
+	GroupIdentifier string `json:"GroupIdentifier"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-metricname
+	MetricName string `json:"MetricName"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-name
+	Name string `json:"Name"`
+
+	// Period AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-period
+	Period float64 `json:"Period"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-statistic
+	Statistic string `json:"Statistic"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-tags
+	Tags map[string]string `json:"Tags,omitempty"`
+
+	// TargetResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-targetresourcetype
+	TargetResourceType string `json:"TargetResourceType"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-threshold
+	Threshold float64 `json:"Threshold"`
+
+	// TreatMissingData AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplate.html#cfn-medialive-cloudwatchalarmtemplate-treatmissingdata
+	TreatMissingData string `json:"TreatMissingData"`
+
+	// 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 *CloudWatchAlarmTemplate) AWSCloudFormationType() string {
+	return "AWS::MediaLive::CloudWatchAlarmTemplate"
+}
+
+// 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 CloudWatchAlarmTemplate) MarshalJSON() ([]byte, error) {
+	type Properties CloudWatchAlarmTemplate
+	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 *CloudWatchAlarmTemplate) UnmarshalJSON(b []byte) error {
+	type Properties CloudWatchAlarmTemplate
+	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 = CloudWatchAlarmTemplate(*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/medialive/aws-medialive-cloudwatchalarmtemplategroup.go b/cloudformation/medialive/aws-medialive-cloudwatchalarmtemplategroup.go
new file mode 100644
index 0000000000..92b8d1e76f
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-cloudwatchalarmtemplategroup.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// CloudWatchAlarmTemplateGroup AWS CloudFormation Resource (AWS::MediaLive::CloudWatchAlarmTemplateGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplategroup.html
+type CloudWatchAlarmTemplateGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplategroup.html#cfn-medialive-cloudwatchalarmtemplategroup-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplategroup.html#cfn-medialive-cloudwatchalarmtemplategroup-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cloudwatchalarmtemplategroup.html#cfn-medialive-cloudwatchalarmtemplategroup-tags
+	Tags map[string]string `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 *CloudWatchAlarmTemplateGroup) AWSCloudFormationType() string {
+	return "AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+}
+
+// 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 CloudWatchAlarmTemplateGroup) MarshalJSON() ([]byte, error) {
+	type Properties CloudWatchAlarmTemplateGroup
+	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 *CloudWatchAlarmTemplateGroup) UnmarshalJSON(b []byte) error {
+	type Properties CloudWatchAlarmTemplateGroup
+	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 = CloudWatchAlarmTemplateGroup(*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/medialive/aws-medialive-cluster.go b/cloudformation/medialive/aws-medialive-cluster.go
new file mode 100644
index 0000000000..2ad4a0effd
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-cluster.go
@@ -0,0 +1,137 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::MediaLive::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cluster.html
+type Cluster struct {
+
+	// ClusterType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cluster.html#cfn-medialive-cluster-clustertype
+	ClusterType *string `json:"ClusterType,omitempty"`
+
+	// InstanceRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cluster.html#cfn-medialive-cluster-instancerolearn
+	InstanceRoleArn *string `json:"InstanceRoleArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cluster.html#cfn-medialive-cluster-name
+	Name *string `json:"Name,omitempty"`
+
+	// NetworkSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cluster.html#cfn-medialive-cluster-networksettings
+	NetworkSettings *Cluster_ClusterNetworkSettings `json:"NetworkSettings,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-cluster.html#cfn-medialive-cluster-tags
+	Tags []Cluster_Tags `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 *Cluster) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Cluster"
+}
+
+// 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 Cluster) MarshalJSON() ([]byte, error) {
+	type Properties Cluster
+	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 *Cluster) UnmarshalJSON(b []byte) error {
+	type Properties Cluster
+	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 = Cluster(*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/medialive/aws-medialive-cluster_clusternetworksettings.go b/cloudformation/medialive/aws-medialive-cluster_clusternetworksettings.go
new file mode 100644
index 0000000000..53908a221c
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-cluster_clusternetworksettings.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ClusterNetworkSettings AWS CloudFormation Resource (AWS::MediaLive::Cluster.ClusterNetworkSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-clusternetworksettings.html
+type Cluster_ClusterNetworkSettings struct {
+
+	// DefaultRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-clusternetworksettings.html#cfn-medialive-cluster-clusternetworksettings-defaultroute
+	DefaultRoute *string `json:"DefaultRoute,omitempty"`
+
+	// InterfaceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-clusternetworksettings.html#cfn-medialive-cluster-clusternetworksettings-interfacemappings
+	InterfaceMappings []Cluster_InterfaceMapping `json:"InterfaceMappings,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 *Cluster_ClusterNetworkSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Cluster.ClusterNetworkSettings"
+}
diff --git a/cloudformation/medialive/aws-medialive-cluster_interfacemapping.go b/cloudformation/medialive/aws-medialive-cluster_interfacemapping.go
new file mode 100644
index 0000000000..9533fe2bce
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-cluster_interfacemapping.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_InterfaceMapping AWS CloudFormation Resource (AWS::MediaLive::Cluster.InterfaceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-interfacemapping.html
+type Cluster_InterfaceMapping struct {
+
+	// LogicalInterfaceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-interfacemapping.html#cfn-medialive-cluster-interfacemapping-logicalinterfacename
+	LogicalInterfaceName *string `json:"LogicalInterfaceName,omitempty"`
+
+	// NetworkId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-interfacemapping.html#cfn-medialive-cluster-interfacemapping-networkid
+	NetworkId *string `json:"NetworkId,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 *Cluster_InterfaceMapping) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Cluster.InterfaceMapping"
+}
diff --git a/cloudformation/medialive/aws-medialive-cluster_tags.go b/cloudformation/medialive/aws-medialive-cluster_tags.go
new file mode 100644
index 0000000000..7fd437a54e
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-cluster_tags.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_Tags AWS CloudFormation Resource (AWS::MediaLive::Cluster.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-tags.html
+type Cluster_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-tags.html#cfn-medialive-cluster-tags-key
+	Key *string `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-cluster-tags.html#cfn-medialive-cluster-tags-value
+	Value *string `json:"Value,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 *Cluster_Tags) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Cluster.Tags"
+}
diff --git a/cloudformation/medialive/aws-medialive-eventbridgeruletemplate.go b/cloudformation/medialive/aws-medialive-eventbridgeruletemplate.go
new file mode 100644
index 0000000000..636955f6aa
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-eventbridgeruletemplate.go
@@ -0,0 +1,142 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// EventBridgeRuleTemplate AWS CloudFormation Resource (AWS::MediaLive::EventBridgeRuleTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html
+type EventBridgeRuleTemplate struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html#cfn-medialive-eventbridgeruletemplate-description
+	Description *string `json:"Description,omitempty"`
+
+	// EventTargets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html#cfn-medialive-eventbridgeruletemplate-eventtargets
+	EventTargets []EventBridgeRuleTemplate_EventBridgeRuleTemplateTarget `json:"EventTargets,omitempty"`
+
+	// EventType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html#cfn-medialive-eventbridgeruletemplate-eventtype
+	EventType string `json:"EventType"`
+
+	// GroupIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html#cfn-medialive-eventbridgeruletemplate-groupidentifier
+	GroupIdentifier string `json:"GroupIdentifier"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html#cfn-medialive-eventbridgeruletemplate-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplate.html#cfn-medialive-eventbridgeruletemplate-tags
+	Tags map[string]string `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 *EventBridgeRuleTemplate) AWSCloudFormationType() string {
+	return "AWS::MediaLive::EventBridgeRuleTemplate"
+}
+
+// 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 EventBridgeRuleTemplate) MarshalJSON() ([]byte, error) {
+	type Properties EventBridgeRuleTemplate
+	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 *EventBridgeRuleTemplate) UnmarshalJSON(b []byte) error {
+	type Properties EventBridgeRuleTemplate
+	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 = EventBridgeRuleTemplate(*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/medialive/aws-medialive-eventbridgeruletemplate_eventbridgeruletemplatetarget.go b/cloudformation/medialive/aws-medialive-eventbridgeruletemplate_eventbridgeruletemplatetarget.go
new file mode 100644
index 0000000000..d686da8b2c
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-eventbridgeruletemplate_eventbridgeruletemplatetarget.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// EventBridgeRuleTemplate_EventBridgeRuleTemplateTarget AWS CloudFormation Resource (AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-eventbridgeruletemplate-eventbridgeruletemplatetarget.html
+type EventBridgeRuleTemplate_EventBridgeRuleTemplateTarget struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-eventbridgeruletemplate-eventbridgeruletemplatetarget.html#cfn-medialive-eventbridgeruletemplate-eventbridgeruletemplatetarget-arn
+	Arn string `json:"Arn"`
+
+	// 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 *EventBridgeRuleTemplate_EventBridgeRuleTemplateTarget) AWSCloudFormationType() string {
+	return "AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget"
+}
diff --git a/cloudformation/medialive/aws-medialive-eventbridgeruletemplategroup.go b/cloudformation/medialive/aws-medialive-eventbridgeruletemplategroup.go
new file mode 100644
index 0000000000..e8fe43a709
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-eventbridgeruletemplategroup.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// EventBridgeRuleTemplateGroup AWS CloudFormation Resource (AWS::MediaLive::EventBridgeRuleTemplateGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplategroup.html
+type EventBridgeRuleTemplateGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplategroup.html#cfn-medialive-eventbridgeruletemplategroup-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplategroup.html#cfn-medialive-eventbridgeruletemplategroup-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-eventbridgeruletemplategroup.html#cfn-medialive-eventbridgeruletemplategroup-tags
+	Tags map[string]string `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 *EventBridgeRuleTemplateGroup) AWSCloudFormationType() string {
+	return "AWS::MediaLive::EventBridgeRuleTemplateGroup"
+}
+
+// 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 EventBridgeRuleTemplateGroup) MarshalJSON() ([]byte, error) {
+	type Properties EventBridgeRuleTemplateGroup
+	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 *EventBridgeRuleTemplateGroup) UnmarshalJSON(b []byte) error {
+	type Properties EventBridgeRuleTemplateGroup
+	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 = EventBridgeRuleTemplateGroup(*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/medialive/aws-medialive-input.go b/cloudformation/medialive/aws-medialive-input.go
index fb03431698..90422855d2 100644
--- a/cloudformation/medialive/aws-medialive-input.go
+++ b/cloudformation/medialive/aws-medialive-input.go
@@ -48,6 +48,11 @@ type Input struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-sources
 	Sources []Input_InputSourceRequest `json:"Sources,omitempty"`
 
+	// SrtSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-srtsettings
+	SrtSettings *Input_SrtSettingsRequest `json:"SrtSettings,omitempty"`
+
 	// Tags AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-tags
diff --git a/cloudformation/medialive/aws-medialive-input_srtcallerdecryptionrequest.go b/cloudformation/medialive/aws-medialive-input_srtcallerdecryptionrequest.go
new file mode 100644
index 0000000000..3284563758
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-input_srtcallerdecryptionrequest.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Input_SrtCallerDecryptionRequest AWS CloudFormation Resource (AWS::MediaLive::Input.SrtCallerDecryptionRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallerdecryptionrequest.html
+type Input_SrtCallerDecryptionRequest struct {
+
+	// Algorithm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallerdecryptionrequest.html#cfn-medialive-input-srtcallerdecryptionrequest-algorithm
+	Algorithm *string `json:"Algorithm,omitempty"`
+
+	// PassphraseSecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallerdecryptionrequest.html#cfn-medialive-input-srtcallerdecryptionrequest-passphrasesecretarn
+	PassphraseSecretArn *string `json:"PassphraseSecretArn,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 *Input_SrtCallerDecryptionRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.SrtCallerDecryptionRequest"
+}
diff --git a/cloudformation/medialive/aws-medialive-input_srtcallersourcerequest.go b/cloudformation/medialive/aws-medialive-input_srtcallersourcerequest.go
new file mode 100644
index 0000000000..e9ee1c517b
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-input_srtcallersourcerequest.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Input_SrtCallerSourceRequest AWS CloudFormation Resource (AWS::MediaLive::Input.SrtCallerSourceRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallersourcerequest.html
+type Input_SrtCallerSourceRequest struct {
+
+	// Decryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallersourcerequest.html#cfn-medialive-input-srtcallersourcerequest-decryption
+	Decryption *Input_SrtCallerDecryptionRequest `json:"Decryption,omitempty"`
+
+	// MinimumLatency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallersourcerequest.html#cfn-medialive-input-srtcallersourcerequest-minimumlatency
+	MinimumLatency *int `json:"MinimumLatency,omitempty"`
+
+	// SrtListenerAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallersourcerequest.html#cfn-medialive-input-srtcallersourcerequest-srtlisteneraddress
+	SrtListenerAddress *string `json:"SrtListenerAddress,omitempty"`
+
+	// SrtListenerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallersourcerequest.html#cfn-medialive-input-srtcallersourcerequest-srtlistenerport
+	SrtListenerPort *string `json:"SrtListenerPort,omitempty"`
+
+	// StreamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtcallersourcerequest.html#cfn-medialive-input-srtcallersourcerequest-streamid
+	StreamId *string `json:"StreamId,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 *Input_SrtCallerSourceRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.SrtCallerSourceRequest"
+}
diff --git a/cloudformation/medialive/aws-medialive-input_srtsettingsrequest.go b/cloudformation/medialive/aws-medialive-input_srtsettingsrequest.go
new file mode 100644
index 0000000000..ebffe3fa58
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-input_srtsettingsrequest.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Input_SrtSettingsRequest AWS CloudFormation Resource (AWS::MediaLive::Input.SrtSettingsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtsettingsrequest.html
+type Input_SrtSettingsRequest struct {
+
+	// SrtCallerSources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-srtsettingsrequest.html#cfn-medialive-input-srtsettingsrequest-srtcallersources
+	SrtCallerSources []Input_SrtCallerSourceRequest `json:"SrtCallerSources,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 *Input_SrtSettingsRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.SrtSettingsRequest"
+}
diff --git a/cloudformation/medialive/aws-medialive-multiplexprogram.go b/cloudformation/medialive/aws-medialive-multiplexprogram.go
index fef06c54b6..e5aa28bfb9 100644
--- a/cloudformation/medialive/aws-medialive-multiplexprogram.go
+++ b/cloudformation/medialive/aws-medialive-multiplexprogram.go
@@ -13,11 +13,6 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-multiplexprogram.html
 type Multiplexprogram struct {
 
-	// ChannelId AWS CloudFormation Property
-	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-multiplexprogram.html#cfn-medialive-multiplexprogram-channelid
-	ChannelId *string `json:"ChannelId,omitempty"`
-
 	// MultiplexId AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-multiplexprogram.html#cfn-medialive-multiplexprogram-multiplexid
diff --git a/cloudformation/medialive/aws-medialive-network.go b/cloudformation/medialive/aws-medialive-network.go
new file mode 100644
index 0000000000..0aeb0c970d
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-network.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Network AWS CloudFormation Resource (AWS::MediaLive::Network)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-network.html
+type Network struct {
+
+	// IpPools AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-network.html#cfn-medialive-network-ippools
+	IpPools []Network_IpPool `json:"IpPools"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-network.html#cfn-medialive-network-name
+	Name string `json:"Name"`
+
+	// Routes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-network.html#cfn-medialive-network-routes
+	Routes []Network_Route `json:"Routes,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-network.html#cfn-medialive-network-tags
+	Tags []Network_Tags `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 *Network) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Network"
+}
+
+// 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 Network) MarshalJSON() ([]byte, error) {
+	type Properties Network
+	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 *Network) UnmarshalJSON(b []byte) error {
+	type Properties Network
+	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 = Network(*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/medialive/aws-medialive-network_ippool.go b/cloudformation/medialive/aws-medialive-network_ippool.go
new file mode 100644
index 0000000000..80392511a3
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-network_ippool.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Network_IpPool AWS CloudFormation Resource (AWS::MediaLive::Network.IpPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-ippool.html
+type Network_IpPool struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-ippool.html#cfn-medialive-network-ippool-cidr
+	Cidr *string `json:"Cidr,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 *Network_IpPool) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Network.IpPool"
+}
diff --git a/cloudformation/medialive/aws-medialive-network_route.go b/cloudformation/medialive/aws-medialive-network_route.go
new file mode 100644
index 0000000000..db478032e2
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-network_route.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Network_Route AWS CloudFormation Resource (AWS::MediaLive::Network.Route)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-route.html
+type Network_Route struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-route.html#cfn-medialive-network-route-cidr
+	Cidr *string `json:"Cidr,omitempty"`
+
+	// Gateway AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-route.html#cfn-medialive-network-route-gateway
+	Gateway *string `json:"Gateway,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 *Network_Route) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Network.Route"
+}
diff --git a/cloudformation/medialive/aws-medialive-network_tags.go b/cloudformation/medialive/aws-medialive-network_tags.go
new file mode 100644
index 0000000000..a1fc5a567d
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-network_tags.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Network_Tags AWS CloudFormation Resource (AWS::MediaLive::Network.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-tags.html
+type Network_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-tags.html#cfn-medialive-network-tags-key
+	Key *string `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-network-tags.html#cfn-medialive-network-tags-value
+	Value *string `json:"Value,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 *Network_Tags) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Network.Tags"
+}
diff --git a/cloudformation/medialive/aws-medialive-sdisource.go b/cloudformation/medialive/aws-medialive-sdisource.go
new file mode 100644
index 0000000000..05e613f785
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-sdisource.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SdiSource AWS CloudFormation Resource (AWS::MediaLive::SdiSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-sdisource.html
+type SdiSource struct {
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-sdisource.html#cfn-medialive-sdisource-mode
+	Mode *string `json:"Mode,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-sdisource.html#cfn-medialive-sdisource-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-sdisource.html#cfn-medialive-sdisource-tags
+	Tags []SdiSource_Tags `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-sdisource.html#cfn-medialive-sdisource-type
+	Type string `json:"Type"`
+
+	// 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 *SdiSource) AWSCloudFormationType() string {
+	return "AWS::MediaLive::SdiSource"
+}
+
+// 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 SdiSource) MarshalJSON() ([]byte, error) {
+	type Properties SdiSource
+	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 *SdiSource) UnmarshalJSON(b []byte) error {
+	type Properties SdiSource
+	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 = SdiSource(*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/medialive/aws-medialive-sdisource_tags.go b/cloudformation/medialive/aws-medialive-sdisource_tags.go
new file mode 100644
index 0000000000..b975597e5c
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-sdisource_tags.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SdiSource_Tags AWS CloudFormation Resource (AWS::MediaLive::SdiSource.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-sdisource-tags.html
+type SdiSource_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-sdisource-tags.html#cfn-medialive-sdisource-tags-key
+	Key *string `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-sdisource-tags.html#cfn-medialive-sdisource-tags-value
+	Value *string `json:"Value,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 *SdiSource_Tags) AWSCloudFormationType() string {
+	return "AWS::MediaLive::SdiSource.Tags"
+}
diff --git a/cloudformation/medialive/aws-medialive-signalmap.go b/cloudformation/medialive/aws-medialive-signalmap.go
new file mode 100644
index 0000000000..6ff9891bd0
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-signalmap.go
@@ -0,0 +1,147 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SignalMap AWS CloudFormation Resource (AWS::MediaLive::SignalMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html
+type SignalMap struct {
+
+	// CloudWatchAlarmTemplateGroupIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html#cfn-medialive-signalmap-cloudwatchalarmtemplategroupidentifiers
+	CloudWatchAlarmTemplateGroupIdentifiers []string `json:"CloudWatchAlarmTemplateGroupIdentifiers,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html#cfn-medialive-signalmap-description
+	Description *string `json:"Description,omitempty"`
+
+	// DiscoveryEntryPointArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html#cfn-medialive-signalmap-discoveryentrypointarn
+	DiscoveryEntryPointArn string `json:"DiscoveryEntryPointArn"`
+
+	// EventBridgeRuleTemplateGroupIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html#cfn-medialive-signalmap-eventbridgeruletemplategroupidentifiers
+	EventBridgeRuleTemplateGroupIdentifiers []string `json:"EventBridgeRuleTemplateGroupIdentifiers,omitempty"`
+
+	// ForceRediscovery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html#cfn-medialive-signalmap-forcerediscovery
+	ForceRediscovery *bool `json:"ForceRediscovery,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html#cfn-medialive-signalmap-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-signalmap.html#cfn-medialive-signalmap-tags
+	Tags map[string]string `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 *SignalMap) AWSCloudFormationType() string {
+	return "AWS::MediaLive::SignalMap"
+}
+
+// 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 SignalMap) MarshalJSON() ([]byte, error) {
+	type Properties SignalMap
+	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 *SignalMap) UnmarshalJSON(b []byte) error {
+	type Properties SignalMap
+	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 = SignalMap(*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/medialive/aws-medialive-signalmap_mediaresource.go b/cloudformation/medialive/aws-medialive-signalmap_mediaresource.go
new file mode 100644
index 0000000000..3d82e90fbe
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-signalmap_mediaresource.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SignalMap_MediaResource AWS CloudFormation Resource (AWS::MediaLive::SignalMap.MediaResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-mediaresource.html
+type SignalMap_MediaResource struct {
+
+	// Destinations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-mediaresource.html#cfn-medialive-signalmap-mediaresource-destinations
+	Destinations []SignalMap_MediaResourceNeighbor `json:"Destinations,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-mediaresource.html#cfn-medialive-signalmap-mediaresource-name
+	Name *string `json:"Name,omitempty"`
+
+	// Sources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-mediaresource.html#cfn-medialive-signalmap-mediaresource-sources
+	Sources []SignalMap_MediaResourceNeighbor `json:"Sources,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 *SignalMap_MediaResource) AWSCloudFormationType() string {
+	return "AWS::MediaLive::SignalMap.MediaResource"
+}
diff --git a/cloudformation/medialive/aws-medialive-signalmap_mediaresourceneighbor.go b/cloudformation/medialive/aws-medialive-signalmap_mediaresourceneighbor.go
new file mode 100644
index 0000000000..a0f744e2d4
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-signalmap_mediaresourceneighbor.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SignalMap_MediaResourceNeighbor AWS CloudFormation Resource (AWS::MediaLive::SignalMap.MediaResourceNeighbor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-mediaresourceneighbor.html
+type SignalMap_MediaResourceNeighbor struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-mediaresourceneighbor.html#cfn-medialive-signalmap-mediaresourceneighbor-arn
+	Arn string `json:"Arn"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-mediaresourceneighbor.html#cfn-medialive-signalmap-mediaresourceneighbor-name
+	Name *string `json:"Name,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 *SignalMap_MediaResourceNeighbor) AWSCloudFormationType() string {
+	return "AWS::MediaLive::SignalMap.MediaResourceNeighbor"
+}
diff --git a/cloudformation/medialive/aws-medialive-signalmap_monitordeployment.go b/cloudformation/medialive/aws-medialive-signalmap_monitordeployment.go
new file mode 100644
index 0000000000..80d1a5a27e
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-signalmap_monitordeployment.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SignalMap_MonitorDeployment AWS CloudFormation Resource (AWS::MediaLive::SignalMap.MonitorDeployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-monitordeployment.html
+type SignalMap_MonitorDeployment struct {
+
+	// DetailsUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-monitordeployment.html#cfn-medialive-signalmap-monitordeployment-detailsuri
+	DetailsUri *string `json:"DetailsUri,omitempty"`
+
+	// ErrorMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-monitordeployment.html#cfn-medialive-signalmap-monitordeployment-errormessage
+	ErrorMessage *string `json:"ErrorMessage,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-monitordeployment.html#cfn-medialive-signalmap-monitordeployment-status
+	Status string `json:"Status"`
+
+	// 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 *SignalMap_MonitorDeployment) AWSCloudFormationType() string {
+	return "AWS::MediaLive::SignalMap.MonitorDeployment"
+}
diff --git a/cloudformation/medialive/aws-medialive-signalmap_successfulmonitordeployment.go b/cloudformation/medialive/aws-medialive-signalmap_successfulmonitordeployment.go
new file mode 100644
index 0000000000..ab713a4c62
--- /dev/null
+++ b/cloudformation/medialive/aws-medialive-signalmap_successfulmonitordeployment.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package medialive
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SignalMap_SuccessfulMonitorDeployment AWS CloudFormation Resource (AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-successfulmonitordeployment.html
+type SignalMap_SuccessfulMonitorDeployment struct {
+
+	// DetailsUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-successfulmonitordeployment.html#cfn-medialive-signalmap-successfulmonitordeployment-detailsuri
+	DetailsUri string `json:"DetailsUri"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-signalmap-successfulmonitordeployment.html#cfn-medialive-signalmap-successfulmonitordeployment-status
+	Status string `json:"Status"`
+
+	// 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 *SignalMap_SuccessfulMonitorDeployment) AWSCloudFormationType() string {
+	return "AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment"
+}
diff --git a/cloudformation/mediapackagev2/aws-mediapackagev2-channel.go b/cloudformation/mediapackagev2/aws-mediapackagev2-channel.go
index f1623a08d3..989b7ac6f4 100644
--- a/cloudformation/mediapackagev2/aws-mediapackagev2-channel.go
+++ b/cloudformation/mediapackagev2/aws-mediapackagev2-channel.go
@@ -29,6 +29,11 @@ type Channel struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-channel.html#cfn-mediapackagev2-channel-description
 	Description *string `json:"Description,omitempty"`
 
+	// InputType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-channel.html#cfn-mediapackagev2-channel-inputtype
+	InputType *string `json:"InputType,omitempty"`
+
 	// Tags AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-channel.html#cfn-mediapackagev2-channel-tags
diff --git a/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint.go b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint.go
index 2f9a26c61a..45431bbfde 100644
--- a/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint.go
+++ b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint.go
@@ -25,15 +25,25 @@ type OriginEndpoint struct {
 	ChannelName string `json:"ChannelName"`
 
 	// ContainerType AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-originendpoint.html#cfn-mediapackagev2-originendpoint-containertype
-	ContainerType *string `json:"ContainerType,omitempty"`
+	ContainerType string `json:"ContainerType"`
+
+	// DashManifests AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-originendpoint.html#cfn-mediapackagev2-originendpoint-dashmanifests
+	DashManifests []OriginEndpoint_DashManifestConfiguration `json:"DashManifests,omitempty"`
 
 	// Description AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-originendpoint.html#cfn-mediapackagev2-originendpoint-description
 	Description *string `json:"Description,omitempty"`
 
+	// ForceEndpointErrorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-originendpoint.html#cfn-mediapackagev2-originendpoint-forceendpointerrorconfiguration
+	ForceEndpointErrorConfiguration *OriginEndpoint_ForceEndpointErrorConfiguration `json:"ForceEndpointErrorConfiguration,omitempty"`
+
 	// HlsManifests AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackagev2-originendpoint.html#cfn-mediapackagev2-originendpoint-hlsmanifests
diff --git a/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashmanifestconfiguration.go b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashmanifestconfiguration.go
new file mode 100644
index 0000000000..e0af23f952
--- /dev/null
+++ b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashmanifestconfiguration.go
@@ -0,0 +1,87 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediapackagev2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// OriginEndpoint_DashManifestConfiguration AWS CloudFormation Resource (AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html
+type OriginEndpoint_DashManifestConfiguration struct {
+
+	// DrmSignaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-drmsignaling
+	DrmSignaling *string `json:"DrmSignaling,omitempty"`
+
+	// FilterConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-filterconfiguration
+	FilterConfiguration *OriginEndpoint_FilterConfiguration `json:"FilterConfiguration,omitempty"`
+
+	// ManifestName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-manifestname
+	ManifestName string `json:"ManifestName"`
+
+	// ManifestWindowSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-manifestwindowseconds
+	ManifestWindowSeconds *int `json:"ManifestWindowSeconds,omitempty"`
+
+	// MinBufferTimeSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-minbuffertimeseconds
+	MinBufferTimeSeconds *int `json:"MinBufferTimeSeconds,omitempty"`
+
+	// MinUpdatePeriodSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-minupdateperiodseconds
+	MinUpdatePeriodSeconds *int `json:"MinUpdatePeriodSeconds,omitempty"`
+
+	// PeriodTriggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-periodtriggers
+	PeriodTriggers []string `json:"PeriodTriggers,omitempty"`
+
+	// ScteDash AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-sctedash
+	ScteDash *OriginEndpoint_ScteDash `json:"ScteDash,omitempty"`
+
+	// SegmentTemplateFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-segmenttemplateformat
+	SegmentTemplateFormat *string `json:"SegmentTemplateFormat,omitempty"`
+
+	// SuggestedPresentationDelaySeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-suggestedpresentationdelayseconds
+	SuggestedPresentationDelaySeconds *int `json:"SuggestedPresentationDelaySeconds,omitempty"`
+
+	// UtcTiming AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashmanifestconfiguration.html#cfn-mediapackagev2-originendpoint-dashmanifestconfiguration-utctiming
+	UtcTiming *OriginEndpoint_DashUtcTiming `json:"UtcTiming,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 *OriginEndpoint_DashManifestConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration"
+}
diff --git a/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashutctiming.go b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashutctiming.go
new file mode 100644
index 0000000000..ea0d939c93
--- /dev/null
+++ b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_dashutctiming.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediapackagev2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// OriginEndpoint_DashUtcTiming AWS CloudFormation Resource (AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashutctiming.html
+type OriginEndpoint_DashUtcTiming struct {
+
+	// TimingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashutctiming.html#cfn-mediapackagev2-originendpoint-dashutctiming-timingmode
+	TimingMode *string `json:"TimingMode,omitempty"`
+
+	// TimingSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-dashutctiming.html#cfn-mediapackagev2-originendpoint-dashutctiming-timingsource
+	TimingSource *string `json:"TimingSource,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 *OriginEndpoint_DashUtcTiming) AWSCloudFormationType() string {
+	return "AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming"
+}
diff --git a/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_forceendpointerrorconfiguration.go b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_forceendpointerrorconfiguration.go
new file mode 100644
index 0000000000..ad96b79a8c
--- /dev/null
+++ b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_forceendpointerrorconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediapackagev2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// OriginEndpoint_ForceEndpointErrorConfiguration AWS CloudFormation Resource (AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-forceendpointerrorconfiguration.html
+type OriginEndpoint_ForceEndpointErrorConfiguration struct {
+
+	// EndpointErrorConditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-forceendpointerrorconfiguration.html#cfn-mediapackagev2-originendpoint-forceendpointerrorconfiguration-endpointerrorconditions
+	EndpointErrorConditions []string `json:"EndpointErrorConditions,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 *OriginEndpoint_ForceEndpointErrorConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration"
+}
diff --git a/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_sctedash.go b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_sctedash.go
new file mode 100644
index 0000000000..ee354d6129
--- /dev/null
+++ b/cloudformation/mediapackagev2/aws-mediapackagev2-originendpoint_sctedash.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package mediapackagev2
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// OriginEndpoint_ScteDash AWS CloudFormation Resource (AWS::MediaPackageV2::OriginEndpoint.ScteDash)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-sctedash.html
+type OriginEndpoint_ScteDash struct {
+
+	// AdMarkerDash AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackagev2-originendpoint-sctedash.html#cfn-mediapackagev2-originendpoint-sctedash-admarkerdash
+	AdMarkerDash *string `json:"AdMarkerDash,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 *OriginEndpoint_ScteDash) AWSCloudFormationType() string {
+	return "AWS::MediaPackageV2::OriginEndpoint.ScteDash"
+}
diff --git a/cloudformation/mediatailor/aws-mediatailor-playbackconfiguration_availsuppression.go b/cloudformation/mediatailor/aws-mediatailor-playbackconfiguration_availsuppression.go
index 08406c636e..993ad224a3 100644
--- a/cloudformation/mediatailor/aws-mediatailor-playbackconfiguration_availsuppression.go
+++ b/cloudformation/mediatailor/aws-mediatailor-playbackconfiguration_availsuppression.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediatailor-playbackconfiguration-availsuppression.html
 type PlaybackConfiguration_AvailSuppression struct {
 
+	// FillPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediatailor-playbackconfiguration-availsuppression.html#cfn-mediatailor-playbackconfiguration-availsuppression-fillpolicy
+	FillPolicy *string `json:"FillPolicy,omitempty"`
+
 	// Mode AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediatailor-playbackconfiguration-availsuppression.html#cfn-mediatailor-playbackconfiguration-availsuppression-mode
diff --git a/cloudformation/msk/aws-msk-replicator_replicationtopicnameconfiguration.go b/cloudformation/msk/aws-msk-replicator_replicationtopicnameconfiguration.go
new file mode 100644
index 0000000000..ea06449d18
--- /dev/null
+++ b/cloudformation/msk/aws-msk-replicator_replicationtopicnameconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package msk
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Replicator_ReplicationTopicNameConfiguration AWS CloudFormation Resource (AWS::MSK::Replicator.ReplicationTopicNameConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-replicationtopicnameconfiguration.html
+type Replicator_ReplicationTopicNameConfiguration struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-replicationtopicnameconfiguration.html#cfn-msk-replicator-replicationtopicnameconfiguration-type
+	Type *string `json:"Type,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 *Replicator_ReplicationTopicNameConfiguration) AWSCloudFormationType() string {
+	return "AWS::MSK::Replicator.ReplicationTopicNameConfiguration"
+}
diff --git a/cloudformation/msk/aws-msk-replicator_topicreplication.go b/cloudformation/msk/aws-msk-replicator_topicreplication.go
index cfc96c1d7f..bddb9fa11e 100644
--- a/cloudformation/msk/aws-msk-replicator_topicreplication.go
+++ b/cloudformation/msk/aws-msk-replicator_topicreplication.go
@@ -30,6 +30,11 @@ type Replicator_TopicReplication struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-topicreplication.html#cfn-msk-replicator-topicreplication-startingposition
 	StartingPosition *Replicator_ReplicationStartingPosition `json:"StartingPosition,omitempty"`
 
+	// TopicNameConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-topicreplication.html#cfn-msk-replicator-topicreplication-topicnameconfiguration
+	TopicNameConfiguration *Replicator_ReplicationTopicNameConfiguration `json:"TopicNameConfiguration,omitempty"`
+
 	// TopicsToExclude AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-replicator-topicreplication.html#cfn-msk-replicator-topicreplication-topicstoexclude
diff --git a/cloudformation/mwaa/aws-mwaa-environment.go b/cloudformation/mwaa/aws-mwaa-environment.go
index 402eb5567e..9ba8827dee 100644
--- a/cloudformation/mwaa/aws-mwaa-environment.go
+++ b/cloudformation/mwaa/aws-mwaa-environment.go
@@ -53,11 +53,21 @@ type Environment struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-loggingconfiguration
 	LoggingConfiguration *Environment_LoggingConfiguration `json:"LoggingConfiguration,omitempty"`
 
+	// MaxWebservers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-maxwebservers
+	MaxWebservers *int `json:"MaxWebservers,omitempty"`
+
 	// MaxWorkers AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-maxworkers
 	MaxWorkers *int `json:"MaxWorkers,omitempty"`
 
+	// MinWebservers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-minwebservers
+	MinWebservers *int `json:"MinWebservers,omitempty"`
+
 	// MinWorkers AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-minworkers
diff --git a/cloudformation/neptune/aws-neptune-eventsubscription.go b/cloudformation/neptune/aws-neptune-eventsubscription.go
new file mode 100644
index 0000000000..0416faf2f5
--- /dev/null
+++ b/cloudformation/neptune/aws-neptune-eventsubscription.go
@@ -0,0 +1,137 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package neptune
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// EventSubscription AWS CloudFormation Resource (AWS::Neptune::EventSubscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-eventsubscription.html
+type EventSubscription struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-eventsubscription.html#cfn-neptune-eventsubscription-enabled
+	Enabled *bool `json:"Enabled,omitempty"`
+
+	// EventCategories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-eventsubscription.html#cfn-neptune-eventsubscription-eventcategories
+	EventCategories []string `json:"EventCategories,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-eventsubscription.html#cfn-neptune-eventsubscription-snstopicarn
+	SnsTopicArn *string `json:"SnsTopicArn,omitempty"`
+
+	// SourceIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-eventsubscription.html#cfn-neptune-eventsubscription-sourceids
+	SourceIds []string `json:"SourceIds,omitempty"`
+
+	// SourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-eventsubscription.html#cfn-neptune-eventsubscription-sourcetype
+	SourceType *string `json:"SourceType,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 *EventSubscription) AWSCloudFormationType() string {
+	return "AWS::Neptune::EventSubscription"
+}
+
+// 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 EventSubscription) MarshalJSON() ([]byte, error) {
+	type Properties EventSubscription
+	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 *EventSubscription) UnmarshalJSON(b []byte) error {
+	type Properties EventSubscription
+	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 = EventSubscription(*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/networkfirewall/aws-networkfirewall-firewallpolicy_flowtimeouts.go b/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_flowtimeouts.go
new file mode 100644
index 0000000000..54aff4b710
--- /dev/null
+++ b/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_flowtimeouts.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkfirewall
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FirewallPolicy_FlowTimeouts AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-flowtimeouts.html
+type FirewallPolicy_FlowTimeouts struct {
+
+	// TcpIdleTimeoutSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-flowtimeouts.html#cfn-networkfirewall-firewallpolicy-flowtimeouts-tcpidletimeoutseconds
+	TcpIdleTimeoutSeconds *int `json:"TcpIdleTimeoutSeconds,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 *FirewallPolicy_FlowTimeouts) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts"
+}
diff --git a/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go b/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
index 98a8ea2332..fea2080058 100644
--- a/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
+++ b/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulengineoptions.html
 type FirewallPolicy_StatefulEngineOptions struct {
 
+	// FlowTimeouts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulengineoptions.html#cfn-networkfirewall-firewallpolicy-statefulengineoptions-flowtimeouts
+	FlowTimeouts *FirewallPolicy_FlowTimeouts `json:"FlowTimeouts,omitempty"`
+
 	// RuleOrder AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulengineoptions.html#cfn-networkfirewall-firewallpolicy-statefulengineoptions-ruleorder
diff --git a/cloudformation/networkmanager/aws-networkmanager-connectattachment.go b/cloudformation/networkmanager/aws-networkmanager-connectattachment.go
index 2a8b8b38f5..34d681bb1f 100644
--- a/cloudformation/networkmanager/aws-networkmanager-connectattachment.go
+++ b/cloudformation/networkmanager/aws-networkmanager-connectattachment.go
@@ -24,11 +24,21 @@ type ConnectAttachment struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectattachment.html#cfn-networkmanager-connectattachment-edgelocation
 	EdgeLocation string `json:"EdgeLocation"`
 
+	// NetworkFunctionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectattachment.html#cfn-networkmanager-connectattachment-networkfunctiongroupname
+	NetworkFunctionGroupName *string `json:"NetworkFunctionGroupName,omitempty"`
+
 	// Options AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectattachment.html#cfn-networkmanager-connectattachment-options
 	Options *ConnectAttachment_ConnectAttachmentOptions `json:"Options"`
 
+	// ProposedNetworkFunctionGroupChange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectattachment.html#cfn-networkmanager-connectattachment-proposednetworkfunctiongroupchange
+	ProposedNetworkFunctionGroupChange *ConnectAttachment_ProposedNetworkFunctionGroupChange `json:"ProposedNetworkFunctionGroupChange,omitempty"`
+
 	// ProposedSegmentChange AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-connectattachment.html#cfn-networkmanager-connectattachment-proposedsegmentchange
diff --git a/cloudformation/networkmanager/aws-networkmanager-connectattachment_proposednetworkfunctiongroupchange.go b/cloudformation/networkmanager/aws-networkmanager-connectattachment_proposednetworkfunctiongroupchange.go
new file mode 100644
index 0000000000..ade62fc6a4
--- /dev/null
+++ b/cloudformation/networkmanager/aws-networkmanager-connectattachment_proposednetworkfunctiongroupchange.go
@@ -0,0 +1,48 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkmanager
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// ConnectAttachment_ProposedNetworkFunctionGroupChange AWS CloudFormation Resource (AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-connectattachment-proposednetworkfunctiongroupchange.html
+type ConnectAttachment_ProposedNetworkFunctionGroupChange struct {
+
+	// AttachmentPolicyRuleNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-connectattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-connectattachment-proposednetworkfunctiongroupchange-attachmentpolicyrulenumber
+	AttachmentPolicyRuleNumber *int `json:"AttachmentPolicyRuleNumber,omitempty"`
+
+	// NetworkFunctionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-connectattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-connectattachment-proposednetworkfunctiongroupchange-networkfunctiongroupname
+	NetworkFunctionGroupName *string `json:"NetworkFunctionGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-connectattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-connectattachment-proposednetworkfunctiongroupchange-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 *ConnectAttachment_ProposedNetworkFunctionGroupChange) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange"
+}
diff --git a/cloudformation/networkmanager/aws-networkmanager-corenetwork_corenetworknetworkfunctiongroup.go b/cloudformation/networkmanager/aws-networkmanager-corenetwork_corenetworknetworkfunctiongroup.go
new file mode 100644
index 0000000000..47d7e661de
--- /dev/null
+++ b/cloudformation/networkmanager/aws-networkmanager-corenetwork_corenetworknetworkfunctiongroup.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkmanager
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// CoreNetwork_CoreNetworkNetworkFunctionGroup AWS CloudFormation Resource (AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-corenetwork-corenetworknetworkfunctiongroup.html
+type CoreNetwork_CoreNetworkNetworkFunctionGroup struct {
+
+	// EdgeLocations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-corenetwork-corenetworknetworkfunctiongroup.html#cfn-networkmanager-corenetwork-corenetworknetworkfunctiongroup-edgelocations
+	EdgeLocations []string `json:"EdgeLocations,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-corenetwork-corenetworknetworkfunctiongroup.html#cfn-networkmanager-corenetwork-corenetworknetworkfunctiongroup-name
+	Name *string `json:"Name,omitempty"`
+
+	// Segments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-corenetwork-corenetworknetworkfunctiongroup.html#cfn-networkmanager-corenetwork-corenetworknetworkfunctiongroup-segments
+	Segments *CoreNetwork_Segments `json:"Segments,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 *CoreNetwork_CoreNetworkNetworkFunctionGroup) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup"
+}
diff --git a/cloudformation/networkmanager/aws-networkmanager-corenetwork_segments.go b/cloudformation/networkmanager/aws-networkmanager-corenetwork_segments.go
new file mode 100644
index 0000000000..87bef515cb
--- /dev/null
+++ b/cloudformation/networkmanager/aws-networkmanager-corenetwork_segments.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"
+)
+
+// CoreNetwork_Segments AWS CloudFormation Resource (AWS::NetworkManager::CoreNetwork.Segments)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-corenetwork-segments.html
+type CoreNetwork_Segments struct {
+
+	// SendTo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-corenetwork-segments.html#cfn-networkmanager-corenetwork-segments-sendto
+	SendTo []string `json:"SendTo,omitempty"`
+
+	// SendVia AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-corenetwork-segments.html#cfn-networkmanager-corenetwork-segments-sendvia
+	SendVia []string `json:"SendVia,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 *CoreNetwork_Segments) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::CoreNetwork.Segments"
+}
diff --git a/cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment.go b/cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment.go
index 3cf17d027f..0c34d950af 100644
--- a/cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment.go
+++ b/cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment.go
@@ -19,6 +19,16 @@ type SiteToSiteVpnAttachment struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-sitetositevpnattachment.html#cfn-networkmanager-sitetositevpnattachment-corenetworkid
 	CoreNetworkId string `json:"CoreNetworkId"`
 
+	// NetworkFunctionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-sitetositevpnattachment.html#cfn-networkmanager-sitetositevpnattachment-networkfunctiongroupname
+	NetworkFunctionGroupName *string `json:"NetworkFunctionGroupName,omitempty"`
+
+	// ProposedNetworkFunctionGroupChange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-sitetositevpnattachment.html#cfn-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange
+	ProposedNetworkFunctionGroupChange *SiteToSiteVpnAttachment_ProposedNetworkFunctionGroupChange `json:"ProposedNetworkFunctionGroupChange,omitempty"`
+
 	// ProposedSegmentChange AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-sitetositevpnattachment.html#cfn-networkmanager-sitetositevpnattachment-proposedsegmentchange
diff --git a/cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment_proposednetworkfunctiongroupchange.go b/cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment_proposednetworkfunctiongroupchange.go
new file mode 100644
index 0000000000..fac77b1d35
--- /dev/null
+++ b/cloudformation/networkmanager/aws-networkmanager-sitetositevpnattachment_proposednetworkfunctiongroupchange.go
@@ -0,0 +1,48 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkmanager
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// SiteToSiteVpnAttachment_ProposedNetworkFunctionGroupChange AWS CloudFormation Resource (AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange.html
+type SiteToSiteVpnAttachment_ProposedNetworkFunctionGroupChange struct {
+
+	// AttachmentPolicyRuleNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange-attachmentpolicyrulenumber
+	AttachmentPolicyRuleNumber *int `json:"AttachmentPolicyRuleNumber,omitempty"`
+
+	// NetworkFunctionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange-networkfunctiongroupname
+	NetworkFunctionGroupName *string `json:"NetworkFunctionGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-sitetositevpnattachment-proposednetworkfunctiongroupchange-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 *SiteToSiteVpnAttachment_ProposedNetworkFunctionGroupChange) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange"
+}
diff --git a/cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment.go b/cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment.go
index e1ba5e315b..aafa13ab11 100644
--- a/cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment.go
+++ b/cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment.go
@@ -14,11 +14,21 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayroutetableattachment.html
 type TransitGatewayRouteTableAttachment struct {
 
+	// NetworkFunctionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayroutetableattachment.html#cfn-networkmanager-transitgatewayroutetableattachment-networkfunctiongroupname
+	NetworkFunctionGroupName *string `json:"NetworkFunctionGroupName,omitempty"`
+
 	// PeeringId AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayroutetableattachment.html#cfn-networkmanager-transitgatewayroutetableattachment-peeringid
 	PeeringId string `json:"PeeringId"`
 
+	// ProposedNetworkFunctionGroupChange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayroutetableattachment.html#cfn-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange
+	ProposedNetworkFunctionGroupChange *TransitGatewayRouteTableAttachment_ProposedNetworkFunctionGroupChange `json:"ProposedNetworkFunctionGroupChange,omitempty"`
+
 	// ProposedSegmentChange AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayroutetableattachment.html#cfn-networkmanager-transitgatewayroutetableattachment-proposedsegmentchange
diff --git a/cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment_proposednetworkfunctiongroupchange.go b/cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment_proposednetworkfunctiongroupchange.go
new file mode 100644
index 0000000000..4f7c6c3c75
--- /dev/null
+++ b/cloudformation/networkmanager/aws-networkmanager-transitgatewayroutetableattachment_proposednetworkfunctiongroupchange.go
@@ -0,0 +1,48 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkmanager
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// TransitGatewayRouteTableAttachment_ProposedNetworkFunctionGroupChange AWS CloudFormation Resource (AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange.html
+type TransitGatewayRouteTableAttachment_ProposedNetworkFunctionGroupChange struct {
+
+	// AttachmentPolicyRuleNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange-attachmentpolicyrulenumber
+	AttachmentPolicyRuleNumber *int `json:"AttachmentPolicyRuleNumber,omitempty"`
+
+	// NetworkFunctionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange-networkfunctiongroupname
+	NetworkFunctionGroupName *string `json:"NetworkFunctionGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-transitgatewayroutetableattachment-proposednetworkfunctiongroupchange-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 *TransitGatewayRouteTableAttachment_ProposedNetworkFunctionGroupChange) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange"
+}
diff --git a/cloudformation/networkmanager/aws-networkmanager-vpcattachment.go b/cloudformation/networkmanager/aws-networkmanager-vpcattachment.go
index e433cd7941..a1c8cbbf99 100644
--- a/cloudformation/networkmanager/aws-networkmanager-vpcattachment.go
+++ b/cloudformation/networkmanager/aws-networkmanager-vpcattachment.go
@@ -24,6 +24,11 @@ type VpcAttachment struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-vpcattachment.html#cfn-networkmanager-vpcattachment-options
 	Options *VpcAttachment_VpcOptions `json:"Options,omitempty"`
 
+	// ProposedNetworkFunctionGroupChange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-vpcattachment.html#cfn-networkmanager-vpcattachment-proposednetworkfunctiongroupchange
+	ProposedNetworkFunctionGroupChange *VpcAttachment_ProposedNetworkFunctionGroupChange `json:"ProposedNetworkFunctionGroupChange,omitempty"`
+
 	// ProposedSegmentChange AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-vpcattachment.html#cfn-networkmanager-vpcattachment-proposedsegmentchange
diff --git a/cloudformation/networkmanager/aws-networkmanager-vpcattachment_proposednetworkfunctiongroupchange.go b/cloudformation/networkmanager/aws-networkmanager-vpcattachment_proposednetworkfunctiongroupchange.go
new file mode 100644
index 0000000000..f1398c7c59
--- /dev/null
+++ b/cloudformation/networkmanager/aws-networkmanager-vpcattachment_proposednetworkfunctiongroupchange.go
@@ -0,0 +1,48 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package networkmanager
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// VpcAttachment_ProposedNetworkFunctionGroupChange AWS CloudFormation Resource (AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-vpcattachment-proposednetworkfunctiongroupchange.html
+type VpcAttachment_ProposedNetworkFunctionGroupChange struct {
+
+	// AttachmentPolicyRuleNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-vpcattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-vpcattachment-proposednetworkfunctiongroupchange-attachmentpolicyrulenumber
+	AttachmentPolicyRuleNumber *int `json:"AttachmentPolicyRuleNumber,omitempty"`
+
+	// NetworkFunctionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-vpcattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-vpcattachment-proposednetworkfunctiongroupchange-networkfunctiongroupname
+	NetworkFunctionGroupName *string `json:"NetworkFunctionGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-vpcattachment-proposednetworkfunctiongroupchange.html#cfn-networkmanager-vpcattachment-proposednetworkfunctiongroupchange-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 *VpcAttachment_ProposedNetworkFunctionGroupChange) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange"
+}
diff --git a/cloudformation/opensearchservice/aws-opensearchservice-domain.go b/cloudformation/opensearchservice/aws-opensearchservice-domain.go
index 527811b1e5..ddf83e695e 100644
--- a/cloudformation/opensearchservice/aws-opensearchservice-domain.go
+++ b/cloudformation/opensearchservice/aws-opensearchservice-domain.go
@@ -84,6 +84,11 @@ type Domain struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-offpeakwindowoptions
 	OffPeakWindowOptions *Domain_OffPeakWindowOptions `json:"OffPeakWindowOptions,omitempty"`
 
+	// SkipShardMigrationWait AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-skipshardmigrationwait
+	SkipShardMigrationWait *bool `json:"SkipShardMigrationWait,omitempty"`
+
 	// SnapshotOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-snapshotoptions
diff --git a/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go b/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
index 8fae739e6d..642987611a 100644
--- a/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
+++ b/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
@@ -30,6 +30,11 @@ type Domain_AdvancedSecurityOptionsInput struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-advancedsecurityoptionsinput.html#cfn-opensearchservice-domain-advancedsecurityoptionsinput-internaluserdatabaseenabled
 	InternalUserDatabaseEnabled *bool `json:"InternalUserDatabaseEnabled,omitempty"`
 
+	// JWTOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-advancedsecurityoptionsinput.html#cfn-opensearchservice-domain-advancedsecurityoptionsinput-jwtoptions
+	JWTOptions *Domain_JWTOptions `json:"JWTOptions,omitempty"`
+
 	// MasterUserOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-advancedsecurityoptionsinput.html#cfn-opensearchservice-domain-advancedsecurityoptionsinput-masteruseroptions
diff --git a/cloudformation/opensearchservice/aws-opensearchservice-domain_jwtoptions.go b/cloudformation/opensearchservice/aws-opensearchservice-domain_jwtoptions.go
new file mode 100644
index 0000000000..0fcd8fbd79
--- /dev/null
+++ b/cloudformation/opensearchservice/aws-opensearchservice-domain_jwtoptions.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package opensearchservice
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Domain_JWTOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.JWTOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-jwtoptions.html
+type Domain_JWTOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-jwtoptions.html#cfn-opensearchservice-domain-jwtoptions-enabled
+	Enabled *bool `json:"Enabled,omitempty"`
+
+	// PublicKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-jwtoptions.html#cfn-opensearchservice-domain-jwtoptions-publickey
+	PublicKey *string `json:"PublicKey,omitempty"`
+
+	// RolesKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-jwtoptions.html#cfn-opensearchservice-domain-jwtoptions-roleskey
+	RolesKey *string `json:"RolesKey,omitempty"`
+
+	// SubjectKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-jwtoptions.html#cfn-opensearchservice-domain-jwtoptions-subjectkey
+	SubjectKey *string `json:"SubjectKey,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 *Domain_JWTOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.JWTOptions"
+}
diff --git a/cloudformation/osis/aws-osis-pipeline_vpcattachmentoptions.go b/cloudformation/osis/aws-osis-pipeline_vpcattachmentoptions.go
new file mode 100644
index 0000000000..709af454df
--- /dev/null
+++ b/cloudformation/osis/aws-osis-pipeline_vpcattachmentoptions.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package osis
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipeline_VpcAttachmentOptions AWS CloudFormation Resource (AWS::OSIS::Pipeline.VpcAttachmentOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-osis-pipeline-vpcattachmentoptions.html
+type Pipeline_VpcAttachmentOptions struct {
+
+	// AttachToVpc AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-osis-pipeline-vpcattachmentoptions.html#cfn-osis-pipeline-vpcattachmentoptions-attachtovpc
+	AttachToVpc bool `json:"AttachToVpc"`
+
+	// CidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-osis-pipeline-vpcattachmentoptions.html#cfn-osis-pipeline-vpcattachmentoptions-cidrblock
+	CidrBlock string `json:"CidrBlock"`
+
+	// 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 *Pipeline_VpcAttachmentOptions) AWSCloudFormationType() string {
+	return "AWS::OSIS::Pipeline.VpcAttachmentOptions"
+}
diff --git a/cloudformation/osis/aws-osis-pipeline_vpcoptions.go b/cloudformation/osis/aws-osis-pipeline_vpcoptions.go
index 3e31b7aadb..5f40d42b11 100644
--- a/cloudformation/osis/aws-osis-pipeline_vpcoptions.go
+++ b/cloudformation/osis/aws-osis-pipeline_vpcoptions.go
@@ -20,6 +20,16 @@ type Pipeline_VpcOptions struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-osis-pipeline-vpcoptions.html#cfn-osis-pipeline-vpcoptions-subnetids
 	SubnetIds []string `json:"SubnetIds"`
 
+	// VpcAttachmentOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-osis-pipeline-vpcoptions.html#cfn-osis-pipeline-vpcoptions-vpcattachmentoptions
+	VpcAttachmentOptions *Pipeline_VpcAttachmentOptions `json:"VpcAttachmentOptions,omitempty"`
+
+	// VpcEndpointManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-osis-pipeline-vpcoptions.html#cfn-osis-pipeline-vpcoptions-vpcendpointmanagement
+	VpcEndpointManagement *string `json:"VpcEndpointManagement,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-challenge.go b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-challenge.go
new file mode 100644
index 0000000000..23b564a4a3
--- /dev/null
+++ b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-challenge.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pcaconnectorscep
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Challenge AWS CloudFormation Resource (AWS::PCAConnectorSCEP::Challenge)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-challenge.html
+type Challenge struct {
+
+	// ConnectorArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-challenge.html#cfn-pcaconnectorscep-challenge-connectorarn
+	ConnectorArn string `json:"ConnectorArn"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-challenge.html#cfn-pcaconnectorscep-challenge-tags
+	Tags map[string]string `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 *Challenge) AWSCloudFormationType() string {
+	return "AWS::PCAConnectorSCEP::Challenge"
+}
+
+// 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 Challenge) MarshalJSON() ([]byte, error) {
+	type Properties Challenge
+	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 *Challenge) UnmarshalJSON(b []byte) error {
+	type Properties Challenge
+	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 = Challenge(*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/pcaconnectorscep/aws-pcaconnectorscep-connector.go b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector.go
new file mode 100644
index 0000000000..44d30a7c01
--- /dev/null
+++ b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pcaconnectorscep
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Connector AWS CloudFormation Resource (AWS::PCAConnectorSCEP::Connector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-connector.html
+type Connector struct {
+
+	// CertificateAuthorityArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-connector.html#cfn-pcaconnectorscep-connector-certificateauthorityarn
+	CertificateAuthorityArn string `json:"CertificateAuthorityArn"`
+
+	// MobileDeviceManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-connector.html#cfn-pcaconnectorscep-connector-mobiledevicemanagement
+	MobileDeviceManagement *Connector_MobileDeviceManagement `json:"MobileDeviceManagement,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pcaconnectorscep-connector.html#cfn-pcaconnectorscep-connector-tags
+	Tags map[string]string `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 *Connector) AWSCloudFormationType() string {
+	return "AWS::PCAConnectorSCEP::Connector"
+}
+
+// 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 Connector) MarshalJSON() ([]byte, error) {
+	type Properties Connector
+	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 *Connector) UnmarshalJSON(b []byte) error {
+	type Properties Connector
+	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 = Connector(*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/pcaconnectorscep/aws-pcaconnectorscep-connector_intuneconfiguration.go b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_intuneconfiguration.go
new file mode 100644
index 0000000000..fbdca01a36
--- /dev/null
+++ b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_intuneconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pcaconnectorscep
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Connector_IntuneConfiguration AWS CloudFormation Resource (AWS::PCAConnectorSCEP::Connector.IntuneConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-intuneconfiguration.html
+type Connector_IntuneConfiguration struct {
+
+	// AzureApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-intuneconfiguration.html#cfn-pcaconnectorscep-connector-intuneconfiguration-azureapplicationid
+	AzureApplicationId string `json:"AzureApplicationId"`
+
+	// Domain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-intuneconfiguration.html#cfn-pcaconnectorscep-connector-intuneconfiguration-domain
+	Domain string `json:"Domain"`
+
+	// 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 *Connector_IntuneConfiguration) AWSCloudFormationType() string {
+	return "AWS::PCAConnectorSCEP::Connector.IntuneConfiguration"
+}
diff --git a/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_mobiledevicemanagement.go b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_mobiledevicemanagement.go
new file mode 100644
index 0000000000..cd85550189
--- /dev/null
+++ b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_mobiledevicemanagement.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pcaconnectorscep
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Connector_MobileDeviceManagement AWS CloudFormation Resource (AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-mobiledevicemanagement.html
+type Connector_MobileDeviceManagement struct {
+
+	// Intune AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-mobiledevicemanagement.html#cfn-pcaconnectorscep-connector-mobiledevicemanagement-intune
+	Intune *Connector_IntuneConfiguration `json:"Intune"`
+
+	// 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 *Connector_MobileDeviceManagement) AWSCloudFormationType() string {
+	return "AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement"
+}
diff --git a/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_openidconfiguration.go b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_openidconfiguration.go
new file mode 100644
index 0000000000..2da15c61ec
--- /dev/null
+++ b/cloudformation/pcaconnectorscep/aws-pcaconnectorscep-connector_openidconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pcaconnectorscep
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Connector_OpenIdConfiguration AWS CloudFormation Resource (AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-openidconfiguration.html
+type Connector_OpenIdConfiguration struct {
+
+	// Audience AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-openidconfiguration.html#cfn-pcaconnectorscep-connector-openidconfiguration-audience
+	Audience *string `json:"Audience,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-openidconfiguration.html#cfn-pcaconnectorscep-connector-openidconfiguration-issuer
+	Issuer *string `json:"Issuer,omitempty"`
+
+	// Subject AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pcaconnectorscep-connector-openidconfiguration.html#cfn-pcaconnectorscep-connector-openidconfiguration-subject
+	Subject *string `json:"Subject,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 *Connector_OpenIdConfiguration) AWSCloudFormationType() string {
+	return "AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration"
+}
diff --git a/cloudformation/pipes/aws-pipes-pipe.go b/cloudformation/pipes/aws-pipes-pipe.go
index afd649e4de..43530d3869 100644
--- a/cloudformation/pipes/aws-pipes-pipe.go
+++ b/cloudformation/pipes/aws-pipes-pipe.go
@@ -33,6 +33,11 @@ type Pipe struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pipes-pipe.html#cfn-pipes-pipe-enrichmentparameters
 	EnrichmentParameters *Pipe_PipeEnrichmentParameters `json:"EnrichmentParameters,omitempty"`
 
+	// KmsKeyIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pipes-pipe.html#cfn-pipes-pipe-kmskeyidentifier
+	KmsKeyIdentifier *string `json:"KmsKeyIdentifier,omitempty"`
+
 	// LogConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pipes-pipe.html#cfn-pipes-pipe-logconfiguration
diff --git a/cloudformation/pipes/aws-pipes-pipe_dimensionmapping.go b/cloudformation/pipes/aws-pipes-pipe_dimensionmapping.go
new file mode 100644
index 0000000000..07ff617723
--- /dev/null
+++ b/cloudformation/pipes/aws-pipes-pipe_dimensionmapping.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pipes
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipe_DimensionMapping AWS CloudFormation Resource (AWS::Pipes::Pipe.DimensionMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-dimensionmapping.html
+type Pipe_DimensionMapping struct {
+
+	// DimensionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-dimensionmapping.html#cfn-pipes-pipe-dimensionmapping-dimensionname
+	DimensionName string `json:"DimensionName"`
+
+	// DimensionValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-dimensionmapping.html#cfn-pipes-pipe-dimensionmapping-dimensionvalue
+	DimensionValue string `json:"DimensionValue"`
+
+	// DimensionValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-dimensionmapping.html#cfn-pipes-pipe-dimensionmapping-dimensionvaluetype
+	DimensionValueType string `json:"DimensionValueType"`
+
+	// 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 *Pipe_DimensionMapping) AWSCloudFormationType() string {
+	return "AWS::Pipes::Pipe.DimensionMapping"
+}
diff --git a/cloudformation/pipes/aws-pipes-pipe_multimeasureattributemapping.go b/cloudformation/pipes/aws-pipes-pipe_multimeasureattributemapping.go
new file mode 100644
index 0000000000..c45c2e1c04
--- /dev/null
+++ b/cloudformation/pipes/aws-pipes-pipe_multimeasureattributemapping.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pipes
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipe_MultiMeasureAttributeMapping AWS CloudFormation Resource (AWS::Pipes::Pipe.MultiMeasureAttributeMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-multimeasureattributemapping.html
+type Pipe_MultiMeasureAttributeMapping struct {
+
+	// MeasureValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-multimeasureattributemapping.html#cfn-pipes-pipe-multimeasureattributemapping-measurevalue
+	MeasureValue string `json:"MeasureValue"`
+
+	// MeasureValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-multimeasureattributemapping.html#cfn-pipes-pipe-multimeasureattributemapping-measurevaluetype
+	MeasureValueType string `json:"MeasureValueType"`
+
+	// MultiMeasureAttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-multimeasureattributemapping.html#cfn-pipes-pipe-multimeasureattributemapping-multimeasureattributename
+	MultiMeasureAttributeName string `json:"MultiMeasureAttributeName"`
+
+	// 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 *Pipe_MultiMeasureAttributeMapping) AWSCloudFormationType() string {
+	return "AWS::Pipes::Pipe.MultiMeasureAttributeMapping"
+}
diff --git a/cloudformation/pipes/aws-pipes-pipe_multimeasuremapping.go b/cloudformation/pipes/aws-pipes-pipe_multimeasuremapping.go
new file mode 100644
index 0000000000..dd9c4bc902
--- /dev/null
+++ b/cloudformation/pipes/aws-pipes-pipe_multimeasuremapping.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pipes
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipe_MultiMeasureMapping AWS CloudFormation Resource (AWS::Pipes::Pipe.MultiMeasureMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-multimeasuremapping.html
+type Pipe_MultiMeasureMapping struct {
+
+	// MultiMeasureAttributeMappings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-multimeasuremapping.html#cfn-pipes-pipe-multimeasuremapping-multimeasureattributemappings
+	MultiMeasureAttributeMappings []Pipe_MultiMeasureAttributeMapping `json:"MultiMeasureAttributeMappings"`
+
+	// MultiMeasureName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-multimeasuremapping.html#cfn-pipes-pipe-multimeasuremapping-multimeasurename
+	MultiMeasureName string `json:"MultiMeasureName"`
+
+	// 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 *Pipe_MultiMeasureMapping) AWSCloudFormationType() string {
+	return "AWS::Pipes::Pipe.MultiMeasureMapping"
+}
diff --git a/cloudformation/pipes/aws-pipes-pipe_pipetargetparameters.go b/cloudformation/pipes/aws-pipes-pipe_pipetargetparameters.go
index f83861a84d..1d21e319dd 100644
--- a/cloudformation/pipes/aws-pipes-pipe_pipetargetparameters.go
+++ b/cloudformation/pipes/aws-pipes-pipe_pipetargetparameters.go
@@ -70,6 +70,11 @@ type Pipe_PipeTargetParameters struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargetparameters.html#cfn-pipes-pipe-pipetargetparameters-stepfunctionstatemachineparameters
 	StepFunctionStateMachineParameters *Pipe_PipeTargetStateMachineParameters `json:"StepFunctionStateMachineParameters,omitempty"`
 
+	// TimestreamParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargetparameters.html#cfn-pipes-pipe-pipetargetparameters-timestreamparameters
+	TimestreamParameters *Pipe_PipeTargetTimestreamParameters `json:"TimestreamParameters,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/pipes/aws-pipes-pipe_pipetargettimestreamparameters.go b/cloudformation/pipes/aws-pipes-pipe_pipetargettimestreamparameters.go
new file mode 100644
index 0000000000..4dd6ae773b
--- /dev/null
+++ b/cloudformation/pipes/aws-pipes-pipe_pipetargettimestreamparameters.go
@@ -0,0 +1,72 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pipes
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipe_PipeTargetTimestreamParameters AWS CloudFormation Resource (AWS::Pipes::Pipe.PipeTargetTimestreamParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html
+type Pipe_PipeTargetTimestreamParameters struct {
+
+	// DimensionMappings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-dimensionmappings
+	DimensionMappings []Pipe_DimensionMapping `json:"DimensionMappings"`
+
+	// EpochTimeUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-epochtimeunit
+	EpochTimeUnit *string `json:"EpochTimeUnit,omitempty"`
+
+	// MultiMeasureMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-multimeasuremappings
+	MultiMeasureMappings []Pipe_MultiMeasureMapping `json:"MultiMeasureMappings,omitempty"`
+
+	// SingleMeasureMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-singlemeasuremappings
+	SingleMeasureMappings []Pipe_SingleMeasureMapping `json:"SingleMeasureMappings,omitempty"`
+
+	// TimeFieldType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-timefieldtype
+	TimeFieldType *string `json:"TimeFieldType,omitempty"`
+
+	// TimeValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-timevalue
+	TimeValue string `json:"TimeValue"`
+
+	// TimestampFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-timestampformat
+	TimestampFormat *string `json:"TimestampFormat,omitempty"`
+
+	// VersionValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-pipetargettimestreamparameters.html#cfn-pipes-pipe-pipetargettimestreamparameters-versionvalue
+	VersionValue string `json:"VersionValue"`
+
+	// 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 *Pipe_PipeTargetTimestreamParameters) AWSCloudFormationType() string {
+	return "AWS::Pipes::Pipe.PipeTargetTimestreamParameters"
+}
diff --git a/cloudformation/pipes/aws-pipes-pipe_singlemeasuremapping.go b/cloudformation/pipes/aws-pipes-pipe_singlemeasuremapping.go
new file mode 100644
index 0000000000..bfc1575a89
--- /dev/null
+++ b/cloudformation/pipes/aws-pipes-pipe_singlemeasuremapping.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package pipes
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Pipe_SingleMeasureMapping AWS CloudFormation Resource (AWS::Pipes::Pipe.SingleMeasureMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-singlemeasuremapping.html
+type Pipe_SingleMeasureMapping struct {
+
+	// MeasureName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-singlemeasuremapping.html#cfn-pipes-pipe-singlemeasuremapping-measurename
+	MeasureName string `json:"MeasureName"`
+
+	// MeasureValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-singlemeasuremapping.html#cfn-pipes-pipe-singlemeasuremapping-measurevalue
+	MeasureValue string `json:"MeasureValue"`
+
+	// MeasureValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pipes-pipe-singlemeasuremapping.html#cfn-pipes-pipe-singlemeasuremapping-measurevaluetype
+	MeasureValueType string `json:"MeasureValueType"`
+
+	// 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 *Pipe_SingleMeasureMapping) AWSCloudFormationType() string {
+	return "AWS::Pipes::Pipe.SingleMeasureMapping"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-application.go b/cloudformation/qbusiness/aws-qbusiness-application.go
new file mode 100644
index 0000000000..372c8beca5
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-application.go
@@ -0,0 +1,178 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Application AWS CloudFormation Resource (AWS::QBusiness::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html
+type Application struct {
+
+	// AttachmentsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-attachmentsconfiguration
+	AttachmentsConfiguration *Application_AttachmentsConfiguration `json:"AttachmentsConfiguration,omitempty"`
+
+	// AutoSubscriptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-autosubscriptionconfiguration
+	AutoSubscriptionConfiguration *Application_AutoSubscriptionConfiguration `json:"AutoSubscriptionConfiguration,omitempty"`
+
+	// ClientIdsForOIDC AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-clientidsforoidc
+	ClientIdsForOIDC []string `json:"ClientIdsForOIDC,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-description
+	Description *string `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-displayname
+	DisplayName string `json:"DisplayName"`
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-encryptionconfiguration
+	EncryptionConfiguration *Application_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// IamIdentityProviderArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-iamidentityproviderarn
+	IamIdentityProviderArn *string `json:"IamIdentityProviderArn,omitempty"`
+
+	// IdentityCenterInstanceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-identitycenterinstancearn
+	IdentityCenterInstanceArn *string `json:"IdentityCenterInstanceArn,omitempty"`
+
+	// IdentityType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-identitytype
+	IdentityType *string `json:"IdentityType,omitempty"`
+
+	// PersonalizationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-personalizationconfiguration
+	PersonalizationConfiguration *Application_PersonalizationConfiguration `json:"PersonalizationConfiguration,omitempty"`
+
+	// QAppsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-qappsconfiguration
+	QAppsConfiguration *Application_QAppsConfiguration `json:"QAppsConfiguration,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-rolearn
+	RoleArn *string `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-application.html#cfn-qbusiness-application-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 *Application) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Application"
+}
+
+// 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 Application) MarshalJSON() ([]byte, error) {
+	type Properties Application
+	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 *Application) UnmarshalJSON(b []byte) error {
+	type Properties Application
+	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 = Application(*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/qbusiness/aws-qbusiness-application_attachmentsconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-application_attachmentsconfiguration.go
new file mode 100644
index 0000000000..729e032922
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-application_attachmentsconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_AttachmentsConfiguration AWS CloudFormation Resource (AWS::QBusiness::Application.AttachmentsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-attachmentsconfiguration.html
+type Application_AttachmentsConfiguration struct {
+
+	// AttachmentsControlMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-attachmentsconfiguration.html#cfn-qbusiness-application-attachmentsconfiguration-attachmentscontrolmode
+	AttachmentsControlMode string `json:"AttachmentsControlMode"`
+
+	// 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 *Application_AttachmentsConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Application.AttachmentsConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-application_autosubscriptionconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-application_autosubscriptionconfiguration.go
new file mode 100644
index 0000000000..a2c7f8be53
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-application_autosubscriptionconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_AutoSubscriptionConfiguration AWS CloudFormation Resource (AWS::QBusiness::Application.AutoSubscriptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-autosubscriptionconfiguration.html
+type Application_AutoSubscriptionConfiguration struct {
+
+	// AutoSubscribe AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-autosubscriptionconfiguration.html#cfn-qbusiness-application-autosubscriptionconfiguration-autosubscribe
+	AutoSubscribe string `json:"AutoSubscribe"`
+
+	// DefaultSubscriptionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-autosubscriptionconfiguration.html#cfn-qbusiness-application-autosubscriptionconfiguration-defaultsubscriptiontype
+	DefaultSubscriptionType *string `json:"DefaultSubscriptionType,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 *Application_AutoSubscriptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Application.AutoSubscriptionConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-application_encryptionconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-application_encryptionconfiguration.go
new file mode 100644
index 0000000000..15ebcc40e2
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-application_encryptionconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_EncryptionConfiguration AWS CloudFormation Resource (AWS::QBusiness::Application.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-encryptionconfiguration.html
+type Application_EncryptionConfiguration struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-encryptionconfiguration.html#cfn-qbusiness-application-encryptionconfiguration-kmskeyid
+	KmsKeyId *string `json:"KmsKeyId,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 *Application_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Application.EncryptionConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-application_personalizationconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-application_personalizationconfiguration.go
new file mode 100644
index 0000000000..5653b9cb71
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-application_personalizationconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_PersonalizationConfiguration AWS CloudFormation Resource (AWS::QBusiness::Application.PersonalizationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-personalizationconfiguration.html
+type Application_PersonalizationConfiguration struct {
+
+	// PersonalizationControlMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-personalizationconfiguration.html#cfn-qbusiness-application-personalizationconfiguration-personalizationcontrolmode
+	PersonalizationControlMode string `json:"PersonalizationControlMode"`
+
+	// 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 *Application_PersonalizationConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Application.PersonalizationConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-application_qappsconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-application_qappsconfiguration.go
new file mode 100644
index 0000000000..06d1c86a34
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-application_qappsconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_QAppsConfiguration AWS CloudFormation Resource (AWS::QBusiness::Application.QAppsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-qappsconfiguration.html
+type Application_QAppsConfiguration struct {
+
+	// QAppsControlMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-application-qappsconfiguration.html#cfn-qbusiness-application-qappsconfiguration-qappscontrolmode
+	QAppsControlMode string `json:"QAppsControlMode"`
+
+	// 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 *Application_QAppsConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Application.QAppsConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-datasource.go b/cloudformation/qbusiness/aws-qbusiness-datasource.go
new file mode 100644
index 0000000000..5376b3827d
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource.go
@@ -0,0 +1,163 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// DataSource AWS CloudFormation Resource (AWS::QBusiness::DataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html
+type DataSource struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-applicationid
+	ApplicationId string `json:"ApplicationId"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-configuration
+	Configuration interface{} `json:"Configuration"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-description
+	Description *string `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-displayname
+	DisplayName string `json:"DisplayName"`
+
+	// DocumentEnrichmentConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-documentenrichmentconfiguration
+	DocumentEnrichmentConfiguration *DataSource_DocumentEnrichmentConfiguration `json:"DocumentEnrichmentConfiguration,omitempty"`
+
+	// IndexId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-indexid
+	IndexId string `json:"IndexId"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-rolearn
+	RoleArn *string `json:"RoleArn,omitempty"`
+
+	// SyncSchedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-syncschedule
+	SyncSchedule *string `json:"SyncSchedule,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-datasource.html#cfn-qbusiness-datasource-vpcconfiguration
+	VpcConfiguration *DataSource_DataSourceVpcConfiguration `json:"VpcConfiguration,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 *DataSource) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource"
+}
+
+// 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 DataSource) MarshalJSON() ([]byte, error) {
+	type Properties DataSource
+	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 *DataSource) UnmarshalJSON(b []byte) error {
+	type Properties DataSource
+	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 = DataSource(*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/qbusiness/aws-qbusiness-datasource_datasourcevpcconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-datasource_datasourcevpcconfiguration.go
new file mode 100644
index 0000000000..b66ff2a4a6
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource_datasourcevpcconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_DataSourceVpcConfiguration AWS CloudFormation Resource (AWS::QBusiness::DataSource.DataSourceVpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-datasourcevpcconfiguration.html
+type DataSource_DataSourceVpcConfiguration struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-datasourcevpcconfiguration.html#cfn-qbusiness-datasource-datasourcevpcconfiguration-securitygroupids
+	SecurityGroupIds []string `json:"SecurityGroupIds"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-datasourcevpcconfiguration.html#cfn-qbusiness-datasource-datasourcevpcconfiguration-subnetids
+	SubnetIds []string `json:"SubnetIds"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_DataSourceVpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource.DataSourceVpcConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributecondition.go b/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributecondition.go
new file mode 100644
index 0000000000..acbfb9064b
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributecondition.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_DocumentAttributeCondition AWS CloudFormation Resource (AWS::QBusiness::DataSource.DocumentAttributeCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributecondition.html
+type DataSource_DocumentAttributeCondition struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributecondition.html#cfn-qbusiness-datasource-documentattributecondition-key
+	Key string `json:"Key"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributecondition.html#cfn-qbusiness-datasource-documentattributecondition-operator
+	Operator string `json:"Operator"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributecondition.html#cfn-qbusiness-datasource-documentattributecondition-value
+	Value *DataSource_DocumentAttributeValue `json:"Value,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 *DataSource_DocumentAttributeCondition) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource.DocumentAttributeCondition"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributetarget.go b/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributetarget.go
new file mode 100644
index 0000000000..51ec4ad528
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributetarget.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_DocumentAttributeTarget AWS CloudFormation Resource (AWS::QBusiness::DataSource.DocumentAttributeTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributetarget.html
+type DataSource_DocumentAttributeTarget struct {
+
+	// AttributeValueOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributetarget.html#cfn-qbusiness-datasource-documentattributetarget-attributevalueoperator
+	AttributeValueOperator *string `json:"AttributeValueOperator,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributetarget.html#cfn-qbusiness-datasource-documentattributetarget-key
+	Key string `json:"Key"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributetarget.html#cfn-qbusiness-datasource-documentattributetarget-value
+	Value *DataSource_DocumentAttributeValue `json:"Value,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 *DataSource_DocumentAttributeTarget) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource.DocumentAttributeTarget"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributevalue.go b/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributevalue.go
new file mode 100644
index 0000000000..21cb1135e7
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource_documentattributevalue.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_DocumentAttributeValue AWS CloudFormation Resource (AWS::QBusiness::DataSource.DocumentAttributeValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributevalue.html
+type DataSource_DocumentAttributeValue struct {
+
+	// DateValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributevalue.html#cfn-qbusiness-datasource-documentattributevalue-datevalue
+	DateValue *string `json:"DateValue,omitempty"`
+
+	// LongValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributevalue.html#cfn-qbusiness-datasource-documentattributevalue-longvalue
+	LongValue *float64 `json:"LongValue,omitempty"`
+
+	// StringListValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributevalue.html#cfn-qbusiness-datasource-documentattributevalue-stringlistvalue
+	StringListValue []string `json:"StringListValue,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentattributevalue.html#cfn-qbusiness-datasource-documentattributevalue-stringvalue
+	StringValue *string `json:"StringValue,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 *DataSource_DocumentAttributeValue) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource.DocumentAttributeValue"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-datasource_documentenrichmentconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-datasource_documentenrichmentconfiguration.go
new file mode 100644
index 0000000000..a9af721cfb
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource_documentenrichmentconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_DocumentEnrichmentConfiguration AWS CloudFormation Resource (AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentenrichmentconfiguration.html
+type DataSource_DocumentEnrichmentConfiguration struct {
+
+	// InlineConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentenrichmentconfiguration.html#cfn-qbusiness-datasource-documentenrichmentconfiguration-inlineconfigurations
+	InlineConfigurations []DataSource_InlineDocumentEnrichmentConfiguration `json:"InlineConfigurations,omitempty"`
+
+	// PostExtractionHookConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentenrichmentconfiguration.html#cfn-qbusiness-datasource-documentenrichmentconfiguration-postextractionhookconfiguration
+	PostExtractionHookConfiguration *DataSource_HookConfiguration `json:"PostExtractionHookConfiguration,omitempty"`
+
+	// PreExtractionHookConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-documentenrichmentconfiguration.html#cfn-qbusiness-datasource-documentenrichmentconfiguration-preextractionhookconfiguration
+	PreExtractionHookConfiguration *DataSource_HookConfiguration `json:"PreExtractionHookConfiguration,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 *DataSource_DocumentEnrichmentConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-datasource_hookconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-datasource_hookconfiguration.go
new file mode 100644
index 0000000000..7285454696
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource_hookconfiguration.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_HookConfiguration AWS CloudFormation Resource (AWS::QBusiness::DataSource.HookConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-hookconfiguration.html
+type DataSource_HookConfiguration struct {
+
+	// InvocationCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-hookconfiguration.html#cfn-qbusiness-datasource-hookconfiguration-invocationcondition
+	InvocationCondition *DataSource_DocumentAttributeCondition `json:"InvocationCondition,omitempty"`
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-hookconfiguration.html#cfn-qbusiness-datasource-hookconfiguration-lambdaarn
+	LambdaArn *string `json:"LambdaArn,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-hookconfiguration.html#cfn-qbusiness-datasource-hookconfiguration-rolearn
+	RoleArn *string `json:"RoleArn,omitempty"`
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-hookconfiguration.html#cfn-qbusiness-datasource-hookconfiguration-s3bucketname
+	S3BucketName *string `json:"S3BucketName,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 *DataSource_HookConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource.HookConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-datasource_inlinedocumentenrichmentconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-datasource_inlinedocumentenrichmentconfiguration.go
new file mode 100644
index 0000000000..92f2cea564
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-datasource_inlinedocumentenrichmentconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_InlineDocumentEnrichmentConfiguration AWS CloudFormation Resource (AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-inlinedocumentenrichmentconfiguration.html
+type DataSource_InlineDocumentEnrichmentConfiguration struct {
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-inlinedocumentenrichmentconfiguration.html#cfn-qbusiness-datasource-inlinedocumentenrichmentconfiguration-condition
+	Condition *DataSource_DocumentAttributeCondition `json:"Condition,omitempty"`
+
+	// DocumentContentOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-inlinedocumentenrichmentconfiguration.html#cfn-qbusiness-datasource-inlinedocumentenrichmentconfiguration-documentcontentoperator
+	DocumentContentOperator *string `json:"DocumentContentOperator,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-datasource-inlinedocumentenrichmentconfiguration.html#cfn-qbusiness-datasource-inlinedocumentenrichmentconfiguration-target
+	Target *DataSource_DocumentAttributeTarget `json:"Target,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 *DataSource_InlineDocumentEnrichmentConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-index.go b/cloudformation/qbusiness/aws-qbusiness-index.go
new file mode 100644
index 0000000000..5e9bc7e812
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-index.go
@@ -0,0 +1,148 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Index AWS CloudFormation Resource (AWS::QBusiness::Index)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html
+type Index struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html#cfn-qbusiness-index-applicationid
+	ApplicationId string `json:"ApplicationId"`
+
+	// CapacityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html#cfn-qbusiness-index-capacityconfiguration
+	CapacityConfiguration *Index_IndexCapacityConfiguration `json:"CapacityConfiguration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html#cfn-qbusiness-index-description
+	Description *string `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html#cfn-qbusiness-index-displayname
+	DisplayName string `json:"DisplayName"`
+
+	// DocumentAttributeConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html#cfn-qbusiness-index-documentattributeconfigurations
+	DocumentAttributeConfigurations []Index_DocumentAttributeConfiguration `json:"DocumentAttributeConfigurations,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html#cfn-qbusiness-index-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-index.html#cfn-qbusiness-index-type
+	Type *string `json:"Type,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 *Index) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Index"
+}
+
+// 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 Index) MarshalJSON() ([]byte, error) {
+	type Properties Index
+	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 *Index) UnmarshalJSON(b []byte) error {
+	type Properties Index
+	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 = Index(*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/qbusiness/aws-qbusiness-index_documentattributeconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-index_documentattributeconfiguration.go
new file mode 100644
index 0000000000..5937d3ec70
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-index_documentattributeconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Index_DocumentAttributeConfiguration AWS CloudFormation Resource (AWS::QBusiness::Index.DocumentAttributeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-documentattributeconfiguration.html
+type Index_DocumentAttributeConfiguration struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-documentattributeconfiguration.html#cfn-qbusiness-index-documentattributeconfiguration-name
+	Name *string `json:"Name,omitempty"`
+
+	// Search AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-documentattributeconfiguration.html#cfn-qbusiness-index-documentattributeconfiguration-search
+	Search *string `json:"Search,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-documentattributeconfiguration.html#cfn-qbusiness-index-documentattributeconfiguration-type
+	Type *string `json:"Type,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 *Index_DocumentAttributeConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Index.DocumentAttributeConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-index_indexcapacityconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-index_indexcapacityconfiguration.go
new file mode 100644
index 0000000000..6b3e5806c5
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-index_indexcapacityconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Index_IndexCapacityConfiguration AWS CloudFormation Resource (AWS::QBusiness::Index.IndexCapacityConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-indexcapacityconfiguration.html
+type Index_IndexCapacityConfiguration struct {
+
+	// Units AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-indexcapacityconfiguration.html#cfn-qbusiness-index-indexcapacityconfiguration-units
+	Units *float64 `json:"Units,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 *Index_IndexCapacityConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Index.IndexCapacityConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-index_indexstatistics.go b/cloudformation/qbusiness/aws-qbusiness-index_indexstatistics.go
new file mode 100644
index 0000000000..4fb1f51313
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-index_indexstatistics.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Index_IndexStatistics AWS CloudFormation Resource (AWS::QBusiness::Index.IndexStatistics)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-indexstatistics.html
+type Index_IndexStatistics struct {
+
+	// TextDocumentStatistics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-indexstatistics.html#cfn-qbusiness-index-indexstatistics-textdocumentstatistics
+	TextDocumentStatistics *Index_TextDocumentStatistics `json:"TextDocumentStatistics,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 *Index_IndexStatistics) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Index.IndexStatistics"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-index_textdocumentstatistics.go b/cloudformation/qbusiness/aws-qbusiness-index_textdocumentstatistics.go
new file mode 100644
index 0000000000..9524babc55
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-index_textdocumentstatistics.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Index_TextDocumentStatistics AWS CloudFormation Resource (AWS::QBusiness::Index.TextDocumentStatistics)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-textdocumentstatistics.html
+type Index_TextDocumentStatistics struct {
+
+	// IndexedTextBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-textdocumentstatistics.html#cfn-qbusiness-index-textdocumentstatistics-indexedtextbytes
+	IndexedTextBytes *float64 `json:"IndexedTextBytes,omitempty"`
+
+	// IndexedTextDocumentCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-index-textdocumentstatistics.html#cfn-qbusiness-index-textdocumentstatistics-indexedtextdocumentcount
+	IndexedTextDocumentCount *float64 `json:"IndexedTextDocumentCount,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 *Index_TextDocumentStatistics) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Index.TextDocumentStatistics"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-plugin.go b/cloudformation/qbusiness/aws-qbusiness-plugin.go
new file mode 100644
index 0000000000..0d8d8020fa
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-plugin.go
@@ -0,0 +1,153 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Plugin AWS CloudFormation Resource (AWS::QBusiness::Plugin)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html
+type Plugin struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-applicationid
+	ApplicationId string `json:"ApplicationId"`
+
+	// AuthConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-authconfiguration
+	AuthConfiguration *Plugin_PluginAuthConfiguration `json:"AuthConfiguration"`
+
+	// CustomPluginConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-custompluginconfiguration
+	CustomPluginConfiguration *Plugin_CustomPluginConfiguration `json:"CustomPluginConfiguration,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-displayname
+	DisplayName string `json:"DisplayName"`
+
+	// ServerUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-serverurl
+	ServerUrl *string `json:"ServerUrl,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-state
+	State *string `json:"State,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-plugin.html#cfn-qbusiness-plugin-type
+	Type string `json:"Type"`
+
+	// 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 *Plugin) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Plugin"
+}
+
+// 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 Plugin) MarshalJSON() ([]byte, error) {
+	type Properties Plugin
+	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 *Plugin) UnmarshalJSON(b []byte) error {
+	type Properties Plugin
+	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 = Plugin(*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/qbusiness/aws-qbusiness-plugin_apischema.go b/cloudformation/qbusiness/aws-qbusiness-plugin_apischema.go
new file mode 100644
index 0000000000..f6ef3f5473
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-plugin_apischema.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Plugin_APISchema AWS CloudFormation Resource (AWS::QBusiness::Plugin.APISchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-apischema.html
+type Plugin_APISchema struct {
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-apischema.html#cfn-qbusiness-plugin-apischema-payload
+	Payload *string `json:"Payload,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-apischema.html#cfn-qbusiness-plugin-apischema-s3
+	S3 *Plugin_S3 `json:"S3,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 *Plugin_APISchema) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Plugin.APISchema"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-plugin_basicauthconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-plugin_basicauthconfiguration.go
new file mode 100644
index 0000000000..cea4e89205
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-plugin_basicauthconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Plugin_BasicAuthConfiguration AWS CloudFormation Resource (AWS::QBusiness::Plugin.BasicAuthConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-basicauthconfiguration.html
+type Plugin_BasicAuthConfiguration struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-basicauthconfiguration.html#cfn-qbusiness-plugin-basicauthconfiguration-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-basicauthconfiguration.html#cfn-qbusiness-plugin-basicauthconfiguration-secretarn
+	SecretArn string `json:"SecretArn"`
+
+	// 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 *Plugin_BasicAuthConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Plugin.BasicAuthConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-plugin_custompluginconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-plugin_custompluginconfiguration.go
new file mode 100644
index 0000000000..c0dd0db8e5
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-plugin_custompluginconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Plugin_CustomPluginConfiguration AWS CloudFormation Resource (AWS::QBusiness::Plugin.CustomPluginConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-custompluginconfiguration.html
+type Plugin_CustomPluginConfiguration struct {
+
+	// ApiSchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-custompluginconfiguration.html#cfn-qbusiness-plugin-custompluginconfiguration-apischema
+	ApiSchema *Plugin_APISchema `json:"ApiSchema"`
+
+	// ApiSchemaType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-custompluginconfiguration.html#cfn-qbusiness-plugin-custompluginconfiguration-apischematype
+	ApiSchemaType string `json:"ApiSchemaType"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-custompluginconfiguration.html#cfn-qbusiness-plugin-custompluginconfiguration-description
+	Description string `json:"Description"`
+
+	// 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 *Plugin_CustomPluginConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Plugin.CustomPluginConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-plugin_oauth2clientcredentialconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-plugin_oauth2clientcredentialconfiguration.go
new file mode 100644
index 0000000000..e57432fea2
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-plugin_oauth2clientcredentialconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Plugin_OAuth2ClientCredentialConfiguration AWS CloudFormation Resource (AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-oauth2clientcredentialconfiguration.html
+type Plugin_OAuth2ClientCredentialConfiguration struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-oauth2clientcredentialconfiguration.html#cfn-qbusiness-plugin-oauth2clientcredentialconfiguration-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-oauth2clientcredentialconfiguration.html#cfn-qbusiness-plugin-oauth2clientcredentialconfiguration-secretarn
+	SecretArn string `json:"SecretArn"`
+
+	// 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 *Plugin_OAuth2ClientCredentialConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-plugin_pluginauthconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-plugin_pluginauthconfiguration.go
new file mode 100644
index 0000000000..88e60290d7
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-plugin_pluginauthconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Plugin_PluginAuthConfiguration AWS CloudFormation Resource (AWS::QBusiness::Plugin.PluginAuthConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-pluginauthconfiguration.html
+type Plugin_PluginAuthConfiguration struct {
+
+	// BasicAuthConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-pluginauthconfiguration.html#cfn-qbusiness-plugin-pluginauthconfiguration-basicauthconfiguration
+	BasicAuthConfiguration *Plugin_BasicAuthConfiguration `json:"BasicAuthConfiguration,omitempty"`
+
+	// NoAuthConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-pluginauthconfiguration.html#cfn-qbusiness-plugin-pluginauthconfiguration-noauthconfiguration
+	NoAuthConfiguration interface{} `json:"NoAuthConfiguration,omitempty"`
+
+	// OAuth2ClientCredentialConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-pluginauthconfiguration.html#cfn-qbusiness-plugin-pluginauthconfiguration-oauth2clientcredentialconfiguration
+	OAuth2ClientCredentialConfiguration *Plugin_OAuth2ClientCredentialConfiguration `json:"OAuth2ClientCredentialConfiguration,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 *Plugin_PluginAuthConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Plugin.PluginAuthConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-plugin_s3.go b/cloudformation/qbusiness/aws-qbusiness-plugin_s3.go
new file mode 100644
index 0000000000..7a3e5d5c77
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-plugin_s3.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Plugin_S3 AWS CloudFormation Resource (AWS::QBusiness::Plugin.S3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-s3.html
+type Plugin_S3 struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-s3.html#cfn-qbusiness-plugin-s3-bucket
+	Bucket string `json:"Bucket"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-plugin-s3.html#cfn-qbusiness-plugin-s3-key
+	Key string `json:"Key"`
+
+	// 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 *Plugin_S3) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Plugin.S3"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-retriever.go b/cloudformation/qbusiness/aws-qbusiness-retriever.go
new file mode 100644
index 0000000000..76b646b1f7
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-retriever.go
@@ -0,0 +1,143 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Retriever AWS CloudFormation Resource (AWS::QBusiness::Retriever)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html
+type Retriever struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html#cfn-qbusiness-retriever-applicationid
+	ApplicationId string `json:"ApplicationId"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html#cfn-qbusiness-retriever-configuration
+	Configuration *Retriever_RetrieverConfiguration `json:"Configuration"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html#cfn-qbusiness-retriever-displayname
+	DisplayName string `json:"DisplayName"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html#cfn-qbusiness-retriever-rolearn
+	RoleArn *string `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html#cfn-qbusiness-retriever-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-retriever.html#cfn-qbusiness-retriever-type
+	Type string `json:"Type"`
+
+	// 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 *Retriever) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Retriever"
+}
+
+// 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 Retriever) MarshalJSON() ([]byte, error) {
+	type Properties Retriever
+	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 *Retriever) UnmarshalJSON(b []byte) error {
+	type Properties Retriever
+	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 = Retriever(*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/qbusiness/aws-qbusiness-retriever_kendraindexconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-retriever_kendraindexconfiguration.go
new file mode 100644
index 0000000000..0a2b2c811a
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-retriever_kendraindexconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Retriever_KendraIndexConfiguration AWS CloudFormation Resource (AWS::QBusiness::Retriever.KendraIndexConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-retriever-kendraindexconfiguration.html
+type Retriever_KendraIndexConfiguration struct {
+
+	// IndexId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-retriever-kendraindexconfiguration.html#cfn-qbusiness-retriever-kendraindexconfiguration-indexid
+	IndexId string `json:"IndexId"`
+
+	// 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 *Retriever_KendraIndexConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Retriever.KendraIndexConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-retriever_nativeindexconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-retriever_nativeindexconfiguration.go
new file mode 100644
index 0000000000..9de76423b6
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-retriever_nativeindexconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Retriever_NativeIndexConfiguration AWS CloudFormation Resource (AWS::QBusiness::Retriever.NativeIndexConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-retriever-nativeindexconfiguration.html
+type Retriever_NativeIndexConfiguration struct {
+
+	// IndexId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-retriever-nativeindexconfiguration.html#cfn-qbusiness-retriever-nativeindexconfiguration-indexid
+	IndexId string `json:"IndexId"`
+
+	// 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 *Retriever_NativeIndexConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Retriever.NativeIndexConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-retriever_retrieverconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-retriever_retrieverconfiguration.go
new file mode 100644
index 0000000000..59004535b0
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-retriever_retrieverconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Retriever_RetrieverConfiguration AWS CloudFormation Resource (AWS::QBusiness::Retriever.RetrieverConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-retriever-retrieverconfiguration.html
+type Retriever_RetrieverConfiguration struct {
+
+	// KendraIndexConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-retriever-retrieverconfiguration.html#cfn-qbusiness-retriever-retrieverconfiguration-kendraindexconfiguration
+	KendraIndexConfiguration *Retriever_KendraIndexConfiguration `json:"KendraIndexConfiguration,omitempty"`
+
+	// NativeIndexConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-retriever-retrieverconfiguration.html#cfn-qbusiness-retriever-retrieverconfiguration-nativeindexconfiguration
+	NativeIndexConfiguration *Retriever_NativeIndexConfiguration `json:"NativeIndexConfiguration,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 *Retriever_RetrieverConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::Retriever.RetrieverConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-webexperience.go b/cloudformation/qbusiness/aws-qbusiness-webexperience.go
new file mode 100644
index 0000000000..b64b6a8768
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-webexperience.go
@@ -0,0 +1,153 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// WebExperience AWS CloudFormation Resource (AWS::QBusiness::WebExperience)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html
+type WebExperience struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-applicationid
+	ApplicationId string `json:"ApplicationId"`
+
+	// IdentityProviderConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-identityproviderconfiguration
+	IdentityProviderConfiguration *WebExperience_IdentityProviderConfiguration `json:"IdentityProviderConfiguration,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-rolearn
+	RoleArn *string `json:"RoleArn,omitempty"`
+
+	// SamplePromptsControlMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-samplepromptscontrolmode
+	SamplePromptsControlMode *string `json:"SamplePromptsControlMode,omitempty"`
+
+	// Subtitle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-subtitle
+	Subtitle *string `json:"Subtitle,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-title
+	Title *string `json:"Title,omitempty"`
+
+	// WelcomeMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qbusiness-webexperience.html#cfn-qbusiness-webexperience-welcomemessage
+	WelcomeMessage *string `json:"WelcomeMessage,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 *WebExperience) AWSCloudFormationType() string {
+	return "AWS::QBusiness::WebExperience"
+}
+
+// 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 WebExperience) MarshalJSON() ([]byte, error) {
+	type Properties WebExperience
+	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 *WebExperience) UnmarshalJSON(b []byte) error {
+	type Properties WebExperience
+	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 = WebExperience(*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/qbusiness/aws-qbusiness-webexperience_identityproviderconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-webexperience_identityproviderconfiguration.go
new file mode 100644
index 0000000000..bd96006f3b
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-webexperience_identityproviderconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WebExperience_IdentityProviderConfiguration AWS CloudFormation Resource (AWS::QBusiness::WebExperience.IdentityProviderConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-identityproviderconfiguration.html
+type WebExperience_IdentityProviderConfiguration struct {
+
+	// OpenIDConnectConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-identityproviderconfiguration.html#cfn-qbusiness-webexperience-identityproviderconfiguration-openidconnectconfiguration
+	OpenIDConnectConfiguration *WebExperience_OpenIDConnectProviderConfiguration `json:"OpenIDConnectConfiguration,omitempty"`
+
+	// SamlConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-identityproviderconfiguration.html#cfn-qbusiness-webexperience-identityproviderconfiguration-samlconfiguration
+	SamlConfiguration *WebExperience_SamlProviderConfiguration `json:"SamlConfiguration,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 *WebExperience_IdentityProviderConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::WebExperience.IdentityProviderConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-webexperience_openidconnectproviderconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-webexperience_openidconnectproviderconfiguration.go
new file mode 100644
index 0000000000..1afad001d4
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-webexperience_openidconnectproviderconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WebExperience_OpenIDConnectProviderConfiguration AWS CloudFormation Resource (AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-openidconnectproviderconfiguration.html
+type WebExperience_OpenIDConnectProviderConfiguration struct {
+
+	// SecretsArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-openidconnectproviderconfiguration.html#cfn-qbusiness-webexperience-openidconnectproviderconfiguration-secretsarn
+	SecretsArn string `json:"SecretsArn"`
+
+	// SecretsRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-openidconnectproviderconfiguration.html#cfn-qbusiness-webexperience-openidconnectproviderconfiguration-secretsrole
+	SecretsRole string `json:"SecretsRole"`
+
+	// 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 *WebExperience_OpenIDConnectProviderConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration"
+}
diff --git a/cloudformation/qbusiness/aws-qbusiness-webexperience_samlproviderconfiguration.go b/cloudformation/qbusiness/aws-qbusiness-webexperience_samlproviderconfiguration.go
new file mode 100644
index 0000000000..def3d57d88
--- /dev/null
+++ b/cloudformation/qbusiness/aws-qbusiness-webexperience_samlproviderconfiguration.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package qbusiness
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WebExperience_SamlProviderConfiguration AWS CloudFormation Resource (AWS::QBusiness::WebExperience.SamlProviderConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-samlproviderconfiguration.html
+type WebExperience_SamlProviderConfiguration struct {
+
+	// AuthenticationUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qbusiness-webexperience-samlproviderconfiguration.html#cfn-qbusiness-webexperience-samlproviderconfiguration-authenticationurl
+	AuthenticationUrl string `json:"AuthenticationUrl"`
+
+	// 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 *WebExperience_SamlProviderConfiguration) AWSCloudFormationType() string {
+	return "AWS::QBusiness::WebExperience.SamlProviderConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_analysisdefinition.go b/cloudformation/quicksight/aws-quicksight-analysis_analysisdefinition.go
index c3d4a2d1b0..fb1a4a132b 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_analysisdefinition.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_analysisdefinition.go
@@ -45,6 +45,11 @@ type Analysis_AnalysisDefinition struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysisdefinition.html#cfn-quicksight-analysis-analysisdefinition-parameterdeclarations
 	ParameterDeclarations []Analysis_ParameterDeclaration `json:"ParameterDeclarations,omitempty"`
 
+	// QueryExecutionOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysisdefinition.html#cfn-quicksight-analysis-analysisdefinition-queryexecutionoptions
+	QueryExecutionOptions *Analysis_QueryExecutionOptions `json:"QueryExecutionOptions,omitempty"`
+
 	// Sheets AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysisdefinition.html#cfn-quicksight-analysis-analysisdefinition-sheets
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_categoryinnerfilter.go b/cloudformation/quicksight/aws-quicksight-analysis_categoryinnerfilter.go
new file mode 100644
index 0000000000..e3ea4d2b3f
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_categoryinnerfilter.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_CategoryInnerFilter AWS CloudFormation Resource (AWS::QuickSight::Analysis.CategoryInnerFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-categoryinnerfilter.html
+type Analysis_CategoryInnerFilter struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-categoryinnerfilter.html#cfn-quicksight-analysis-categoryinnerfilter-column
+	Column *Analysis_ColumnIdentifier `json:"Column"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-categoryinnerfilter.html#cfn-quicksight-analysis-categoryinnerfilter-configuration
+	Configuration *Analysis_CategoryFilterConfiguration `json:"Configuration"`
+
+	// DefaultFilterControlConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-categoryinnerfilter.html#cfn-quicksight-analysis-categoryinnerfilter-defaultfiltercontrolconfiguration
+	DefaultFilterControlConfiguration *Analysis_DefaultFilterControlConfiguration `json:"DefaultFilterControlConfiguration,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_CategoryInnerFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.CategoryInnerFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_columntooltipitem.go b/cloudformation/quicksight/aws-quicksight-analysis_columntooltipitem.go
index 504a32dc3b..798b89d38f 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_columntooltipitem.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_columntooltipitem.go
@@ -25,6 +25,11 @@ type Analysis_ColumnTooltipItem struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-columntooltipitem.html#cfn-quicksight-analysis-columntooltipitem-label
 	Label *string `json:"Label,omitempty"`
 
+	// TooltipTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-columntooltipitem.html#cfn-quicksight-analysis-columntooltipitem-tooltiptarget
+	TooltipTarget *string `json:"TooltipTarget,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-columntooltipitem.html#cfn-quicksight-analysis-columntooltipitem-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_combochartconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_combochartconfiguration.go
index f2ac9a7104..69388eef4d 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_combochartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_combochartconfiguration.go
@@ -75,6 +75,11 @@ type Analysis_ComboChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-combochartconfiguration.html#cfn-quicksight-analysis-combochartconfiguration-secondaryyaxislabeloptions
 	SecondaryYAxisLabelOptions *Analysis_ChartAxisLabelOptions `json:"SecondaryYAxisLabelOptions,omitempty"`
 
+	// SingleAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-combochartconfiguration.html#cfn-quicksight-analysis-combochartconfiguration-singleaxisoptions
+	SingleAxisOptions *Analysis_SingleAxisOptions `json:"SingleAxisOptions,omitempty"`
+
 	// SortConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-combochartconfiguration.html#cfn-quicksight-analysis-combochartconfiguration-sortconfiguration
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_defaultdatetimepickercontroloptions.go b/cloudformation/quicksight/aws-quicksight-analysis_defaultdatetimepickercontroloptions.go
index 76a9fd3c77..37d526b552 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_defaultdatetimepickercontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_defaultdatetimepickercontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultdatetimepickercontroloptions.html
 type Analysis_DefaultDateTimePickerControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultdatetimepickercontroloptions.html#cfn-quicksight-analysis-defaultdatetimepickercontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultdatetimepickercontroloptions.html#cfn-quicksight-analysis-defaultdatetimepickercontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_defaultfilterdropdowncontroloptions.go b/cloudformation/quicksight/aws-quicksight-analysis_defaultfilterdropdowncontroloptions.go
index b1d104207f..012f00534b 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_defaultfilterdropdowncontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_defaultfilterdropdowncontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultfilterdropdowncontroloptions.html
 type Analysis_DefaultFilterDropDownControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultfilterdropdowncontroloptions.html#cfn-quicksight-analysis-defaultfilterdropdowncontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultfilterdropdowncontroloptions.html#cfn-quicksight-analysis-defaultfilterdropdowncontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_defaultrelativedatetimecontroloptions.go b/cloudformation/quicksight/aws-quicksight-analysis_defaultrelativedatetimecontroloptions.go
index 63f3a84cdd..c7e66571b2 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_defaultrelativedatetimecontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_defaultrelativedatetimecontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultrelativedatetimecontroloptions.html
 type Analysis_DefaultRelativeDateTimeControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultrelativedatetimecontroloptions.html#cfn-quicksight-analysis-defaultrelativedatetimecontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-defaultrelativedatetimecontroloptions.html#cfn-quicksight-analysis-defaultrelativedatetimecontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_fieldtooltipitem.go b/cloudformation/quicksight/aws-quicksight-analysis_fieldtooltipitem.go
index 9fd177fdc7..4eaa320216 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_fieldtooltipitem.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_fieldtooltipitem.go
@@ -20,6 +20,11 @@ type Analysis_FieldTooltipItem struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-fieldtooltipitem.html#cfn-quicksight-analysis-fieldtooltipitem-label
 	Label *string `json:"Label,omitempty"`
 
+	// TooltipTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-fieldtooltipitem.html#cfn-quicksight-analysis-fieldtooltipitem-tooltiptarget
+	TooltipTarget *string `json:"TooltipTarget,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-fieldtooltipitem.html#cfn-quicksight-analysis-fieldtooltipitem-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_filter.go b/cloudformation/quicksight/aws-quicksight-analysis_filter.go
index 9cff969086..c3da7f836c 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_filter.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_filter.go
@@ -15,6 +15,11 @@ type Analysis_Filter struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filter.html#cfn-quicksight-analysis-filter-categoryfilter
 	CategoryFilter *Analysis_CategoryFilter `json:"CategoryFilter,omitempty"`
 
+	// NestedFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filter.html#cfn-quicksight-analysis-filter-nestedfilter
+	NestedFilter *Analysis_NestedFilter `json:"NestedFilter,omitempty"`
+
 	// NumericEqualityFilter AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filter.html#cfn-quicksight-analysis-filter-numericequalityfilter
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_filterdatetimepickercontrol.go b/cloudformation/quicksight/aws-quicksight-analysis_filterdatetimepickercontrol.go
index 7688eef4b7..252d90f372 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_filterdatetimepickercontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_filterdatetimepickercontrol.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterdatetimepickercontrol.html
 type Analysis_FilterDateTimePickerControl struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterdatetimepickercontrol.html#cfn-quicksight-analysis-filterdatetimepickercontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterdatetimepickercontrol.html#cfn-quicksight-analysis-filterdatetimepickercontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_filterdropdowncontrol.go b/cloudformation/quicksight/aws-quicksight-analysis_filterdropdowncontrol.go
index 8ffe2e1212..0ac83f7452 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_filterdropdowncontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_filterdropdowncontrol.go
@@ -15,6 +15,11 @@ type Analysis_FilterDropDownControl struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterdropdowncontrol.html#cfn-quicksight-analysis-filterdropdowncontrol-cascadingcontrolconfiguration
 	CascadingControlConfiguration *Analysis_CascadingControlConfiguration `json:"CascadingControlConfiguration,omitempty"`
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterdropdowncontrol.html#cfn-quicksight-analysis-filterdropdowncontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterdropdowncontrol.html#cfn-quicksight-analysis-filterdropdowncontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_filterrelativedatetimecontrol.go b/cloudformation/quicksight/aws-quicksight-analysis_filterrelativedatetimecontrol.go
index 9fa76138be..ee43b8e03f 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_filterrelativedatetimecontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_filterrelativedatetimecontrol.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterrelativedatetimecontrol.html
 type Analysis_FilterRelativeDateTimeControl struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterrelativedatetimecontrol.html#cfn-quicksight-analysis-filterrelativedatetimecontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-filterrelativedatetimecontrol.html#cfn-quicksight-analysis-filterrelativedatetimecontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_innerfilter.go b/cloudformation/quicksight/aws-quicksight-analysis_innerfilter.go
new file mode 100644
index 0000000000..f5d80fb515
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_innerfilter.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_InnerFilter AWS CloudFormation Resource (AWS::QuickSight::Analysis.InnerFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-innerfilter.html
+type Analysis_InnerFilter struct {
+
+	// CategoryInnerFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-innerfilter.html#cfn-quicksight-analysis-innerfilter-categoryinnerfilter
+	CategoryInnerFilter *Analysis_CategoryInnerFilter `json:"CategoryInnerFilter,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_InnerFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.InnerFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_linechartconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_linechartconfiguration.go
index 0fd5956042..8bbcb16802 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_linechartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_linechartconfiguration.go
@@ -70,6 +70,11 @@ type Analysis_LineChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-linechartconfiguration.html#cfn-quicksight-analysis-linechartconfiguration-series
 	Series []Analysis_SeriesItem `json:"Series,omitempty"`
 
+	// SingleAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-linechartconfiguration.html#cfn-quicksight-analysis-linechartconfiguration-singleaxisoptions
+	SingleAxisOptions *Analysis_SingleAxisOptions `json:"SingleAxisOptions,omitempty"`
+
 	// SmallMultiplesOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-linechartconfiguration.html#cfn-quicksight-analysis-linechartconfiguration-smallmultiplesoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_nestedfilter.go b/cloudformation/quicksight/aws-quicksight-analysis_nestedfilter.go
new file mode 100644
index 0000000000..8b72804efc
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_nestedfilter.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_NestedFilter AWS CloudFormation Resource (AWS::QuickSight::Analysis.NestedFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-nestedfilter.html
+type Analysis_NestedFilter struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-nestedfilter.html#cfn-quicksight-analysis-nestedfilter-column
+	Column *Analysis_ColumnIdentifier `json:"Column"`
+
+	// FilterId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-nestedfilter.html#cfn-quicksight-analysis-nestedfilter-filterid
+	FilterId string `json:"FilterId"`
+
+	// IncludeInnerSet AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-nestedfilter.html#cfn-quicksight-analysis-nestedfilter-includeinnerset
+	IncludeInnerSet bool `json:"IncludeInnerSet"`
+
+	// InnerFilter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-nestedfilter.html#cfn-quicksight-analysis-nestedfilter-innerfilter
+	InnerFilter *Analysis_InnerFilter `json:"InnerFilter"`
+
+	// 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_NestedFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.NestedFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_parameterdropdowncontrol.go b/cloudformation/quicksight/aws-quicksight-analysis_parameterdropdowncontrol.go
index 4587252040..0db8c1846e 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_parameterdropdowncontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_parameterdropdowncontrol.go
@@ -15,6 +15,11 @@ type Analysis_ParameterDropDownControl struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameterdropdowncontrol.html#cfn-quicksight-analysis-parameterdropdowncontrol-cascadingcontrolconfiguration
 	CascadingControlConfiguration *Analysis_CascadingControlConfiguration `json:"CascadingControlConfiguration,omitempty"`
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameterdropdowncontrol.html#cfn-quicksight-analysis-parameterdropdowncontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameterdropdowncontrol.html#cfn-quicksight-analysis-parameterdropdowncontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_queryexecutionoptions.go b/cloudformation/quicksight/aws-quicksight-analysis_queryexecutionoptions.go
new file mode 100644
index 0000000000..256ef5f4c3
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_queryexecutionoptions.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_QueryExecutionOptions AWS CloudFormation Resource (AWS::QuickSight::Analysis.QueryExecutionOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-queryexecutionoptions.html
+type Analysis_QueryExecutionOptions struct {
+
+	// QueryExecutionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-queryexecutionoptions.html#cfn-quicksight-analysis-queryexecutionoptions-queryexecutionmode
+	QueryExecutionMode *string `json:"QueryExecutionMode,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_QueryExecutionOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.QueryExecutionOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_singleaxisoptions.go b/cloudformation/quicksight/aws-quicksight-analysis_singleaxisoptions.go
new file mode 100644
index 0000000000..cd60931541
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_singleaxisoptions.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_SingleAxisOptions AWS CloudFormation Resource (AWS::QuickSight::Analysis.SingleAxisOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-singleaxisoptions.html
+type Analysis_SingleAxisOptions struct {
+
+	// YAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-singleaxisoptions.html#cfn-quicksight-analysis-singleaxisoptions-yaxisoptions
+	YAxisOptions *Analysis_YAxisOptions `json:"YAxisOptions,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_SingleAxisOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.SingleAxisOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartcolorconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartcolorconfiguration.go
new file mode 100644
index 0000000000..84f971c271
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartcolorconfiguration.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_WaterfallChartColorConfiguration AWS CloudFormation Resource (AWS::QuickSight::Analysis.WaterfallChartColorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartcolorconfiguration.html
+type Analysis_WaterfallChartColorConfiguration struct {
+
+	// GroupColorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartcolorconfiguration.html#cfn-quicksight-analysis-waterfallchartcolorconfiguration-groupcolorconfiguration
+	GroupColorConfiguration *Analysis_WaterfallChartGroupColorConfiguration `json:"GroupColorConfiguration,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_WaterfallChartColorConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.WaterfallChartColorConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartconfiguration.go
index 01b40d314e..d06a694b00 100644
--- a/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartconfiguration.go
@@ -20,6 +20,11 @@ type Analysis_WaterfallChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartconfiguration.html#cfn-quicksight-analysis-waterfallchartconfiguration-categoryaxislabeloptions
 	CategoryAxisLabelOptions *Analysis_ChartAxisLabelOptions `json:"CategoryAxisLabelOptions,omitempty"`
 
+	// ColorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartconfiguration.html#cfn-quicksight-analysis-waterfallchartconfiguration-colorconfiguration
+	ColorConfiguration *Analysis_WaterfallChartColorConfiguration `json:"ColorConfiguration,omitempty"`
+
 	// DataLabels AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartconfiguration.html#cfn-quicksight-analysis-waterfallchartconfiguration-datalabels
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartgroupcolorconfiguration.go b/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartgroupcolorconfiguration.go
new file mode 100644
index 0000000000..7539753c88
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_waterfallchartgroupcolorconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Analysis_WaterfallChartGroupColorConfiguration AWS CloudFormation Resource (AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartgroupcolorconfiguration.html
+type Analysis_WaterfallChartGroupColorConfiguration struct {
+
+	// NegativeBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-analysis-waterfallchartgroupcolorconfiguration-negativebarcolor
+	NegativeBarColor *string `json:"NegativeBarColor,omitempty"`
+
+	// PositiveBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-analysis-waterfallchartgroupcolorconfiguration-positivebarcolor
+	PositiveBarColor *string `json:"PositiveBarColor,omitempty"`
+
+	// TotalBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-analysis-waterfallchartgroupcolorconfiguration-totalbarcolor
+	TotalBarColor *string `json:"TotalBarColor,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_WaterfallChartGroupColorConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-analysis_yaxisoptions.go b/cloudformation/quicksight/aws-quicksight-analysis_yaxisoptions.go
new file mode 100644
index 0000000000..c7c7d57c9a
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-analysis_yaxisoptions.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_YAxisOptions AWS CloudFormation Resource (AWS::QuickSight::Analysis.YAxisOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-yaxisoptions.html
+type Analysis_YAxisOptions struct {
+
+	// YAxis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-yaxisoptions.html#cfn-quicksight-analysis-yaxisoptions-yaxis
+	YAxis string `json:"YAxis"`
+
+	// 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_YAxisOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.YAxisOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_categoryinnerfilter.go b/cloudformation/quicksight/aws-quicksight-dashboard_categoryinnerfilter.go
new file mode 100644
index 0000000000..59a656b9b7
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_categoryinnerfilter.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_CategoryInnerFilter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.CategoryInnerFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-categoryinnerfilter.html
+type Dashboard_CategoryInnerFilter struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-categoryinnerfilter.html#cfn-quicksight-dashboard-categoryinnerfilter-column
+	Column *Dashboard_ColumnIdentifier `json:"Column"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-categoryinnerfilter.html#cfn-quicksight-dashboard-categoryinnerfilter-configuration
+	Configuration *Dashboard_CategoryFilterConfiguration `json:"Configuration"`
+
+	// DefaultFilterControlConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-categoryinnerfilter.html#cfn-quicksight-dashboard-categoryinnerfilter-defaultfiltercontrolconfiguration
+	DefaultFilterControlConfiguration *Dashboard_DefaultFilterControlConfiguration `json:"DefaultFilterControlConfiguration,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_CategoryInnerFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.CategoryInnerFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_columntooltipitem.go b/cloudformation/quicksight/aws-quicksight-dashboard_columntooltipitem.go
index 5621edcfb1..4d42012950 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_columntooltipitem.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_columntooltipitem.go
@@ -25,6 +25,11 @@ type Dashboard_ColumnTooltipItem struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-columntooltipitem.html#cfn-quicksight-dashboard-columntooltipitem-label
 	Label *string `json:"Label,omitempty"`
 
+	// TooltipTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-columntooltipitem.html#cfn-quicksight-dashboard-columntooltipitem-tooltiptarget
+	TooltipTarget *string `json:"TooltipTarget,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-columntooltipitem.html#cfn-quicksight-dashboard-columntooltipitem-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_combochartconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_combochartconfiguration.go
index 4dff5f3921..5bc3879ab2 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_combochartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_combochartconfiguration.go
@@ -75,6 +75,11 @@ type Dashboard_ComboChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-combochartconfiguration.html#cfn-quicksight-dashboard-combochartconfiguration-secondaryyaxislabeloptions
 	SecondaryYAxisLabelOptions *Dashboard_ChartAxisLabelOptions `json:"SecondaryYAxisLabelOptions,omitempty"`
 
+	// SingleAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-combochartconfiguration.html#cfn-quicksight-dashboard-combochartconfiguration-singleaxisoptions
+	SingleAxisOptions *Dashboard_SingleAxisOptions `json:"SingleAxisOptions,omitempty"`
+
 	// SortConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-combochartconfiguration.html#cfn-quicksight-dashboard-combochartconfiguration-sortconfiguration
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_defaultdatetimepickercontroloptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_defaultdatetimepickercontroloptions.go
index e2e8442562..44c794b1bf 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_defaultdatetimepickercontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_defaultdatetimepickercontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultdatetimepickercontroloptions.html
 type Dashboard_DefaultDateTimePickerControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultdatetimepickercontroloptions.html#cfn-quicksight-dashboard-defaultdatetimepickercontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultdatetimepickercontroloptions.html#cfn-quicksight-dashboard-defaultdatetimepickercontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_defaultfilterdropdowncontroloptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_defaultfilterdropdowncontroloptions.go
index 8a05bc2425..8e6b915e7c 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_defaultfilterdropdowncontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_defaultfilterdropdowncontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultfilterdropdowncontroloptions.html
 type Dashboard_DefaultFilterDropDownControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultfilterdropdowncontroloptions.html#cfn-quicksight-dashboard-defaultfilterdropdowncontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultfilterdropdowncontroloptions.html#cfn-quicksight-dashboard-defaultfilterdropdowncontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_defaultrelativedatetimecontroloptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_defaultrelativedatetimecontroloptions.go
index 27678d98d4..835c5cc499 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_defaultrelativedatetimecontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_defaultrelativedatetimecontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultrelativedatetimecontroloptions.html
 type Dashboard_DefaultRelativeDateTimeControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultrelativedatetimecontroloptions.html#cfn-quicksight-dashboard-defaultrelativedatetimecontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-defaultrelativedatetimecontroloptions.html#cfn-quicksight-dashboard-defaultrelativedatetimecontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_fieldtooltipitem.go b/cloudformation/quicksight/aws-quicksight-dashboard_fieldtooltipitem.go
index 5a81c3470d..73cdf02368 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_fieldtooltipitem.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_fieldtooltipitem.go
@@ -20,6 +20,11 @@ type Dashboard_FieldTooltipItem struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-fieldtooltipitem.html#cfn-quicksight-dashboard-fieldtooltipitem-label
 	Label *string `json:"Label,omitempty"`
 
+	// TooltipTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-fieldtooltipitem.html#cfn-quicksight-dashboard-fieldtooltipitem-tooltiptarget
+	TooltipTarget *string `json:"TooltipTarget,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-fieldtooltipitem.html#cfn-quicksight-dashboard-fieldtooltipitem-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_filter.go b/cloudformation/quicksight/aws-quicksight-dashboard_filter.go
index 550daca31e..07121e1a02 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_filter.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_filter.go
@@ -15,6 +15,11 @@ type Dashboard_Filter struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filter.html#cfn-quicksight-dashboard-filter-categoryfilter
 	CategoryFilter *Dashboard_CategoryFilter `json:"CategoryFilter,omitempty"`
 
+	// NestedFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filter.html#cfn-quicksight-dashboard-filter-nestedfilter
+	NestedFilter *Dashboard_NestedFilter `json:"NestedFilter,omitempty"`
+
 	// NumericEqualityFilter AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filter.html#cfn-quicksight-dashboard-filter-numericequalityfilter
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_filterdatetimepickercontrol.go b/cloudformation/quicksight/aws-quicksight-dashboard_filterdatetimepickercontrol.go
index ce2de2fb66..6074bad7a4 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_filterdatetimepickercontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_filterdatetimepickercontrol.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterdatetimepickercontrol.html
 type Dashboard_FilterDateTimePickerControl struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterdatetimepickercontrol.html#cfn-quicksight-dashboard-filterdatetimepickercontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterdatetimepickercontrol.html#cfn-quicksight-dashboard-filterdatetimepickercontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_filterdropdowncontrol.go b/cloudformation/quicksight/aws-quicksight-dashboard_filterdropdowncontrol.go
index ba4d46f0e2..e6a744d2f7 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_filterdropdowncontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_filterdropdowncontrol.go
@@ -15,6 +15,11 @@ type Dashboard_FilterDropDownControl struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterdropdowncontrol.html#cfn-quicksight-dashboard-filterdropdowncontrol-cascadingcontrolconfiguration
 	CascadingControlConfiguration *Dashboard_CascadingControlConfiguration `json:"CascadingControlConfiguration,omitempty"`
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterdropdowncontrol.html#cfn-quicksight-dashboard-filterdropdowncontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterdropdowncontrol.html#cfn-quicksight-dashboard-filterdropdowncontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_filterrelativedatetimecontrol.go b/cloudformation/quicksight/aws-quicksight-dashboard_filterrelativedatetimecontrol.go
index 12390eefb5..956e15f4dd 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_filterrelativedatetimecontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_filterrelativedatetimecontrol.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterrelativedatetimecontrol.html
 type Dashboard_FilterRelativeDateTimeControl struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterrelativedatetimecontrol.html#cfn-quicksight-dashboard-filterrelativedatetimecontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-filterrelativedatetimecontrol.html#cfn-quicksight-dashboard-filterrelativedatetimecontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_innerfilter.go b/cloudformation/quicksight/aws-quicksight-dashboard_innerfilter.go
new file mode 100644
index 0000000000..f1df1d73e4
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_innerfilter.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_InnerFilter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.InnerFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-innerfilter.html
+type Dashboard_InnerFilter struct {
+
+	// CategoryInnerFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-innerfilter.html#cfn-quicksight-dashboard-innerfilter-categoryinnerfilter
+	CategoryInnerFilter *Dashboard_CategoryInnerFilter `json:"CategoryInnerFilter,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_InnerFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.InnerFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_linechartconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_linechartconfiguration.go
index 9aa3f09e8d..52a72622e9 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_linechartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_linechartconfiguration.go
@@ -70,6 +70,11 @@ type Dashboard_LineChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-linechartconfiguration.html#cfn-quicksight-dashboard-linechartconfiguration-series
 	Series []Dashboard_SeriesItem `json:"Series,omitempty"`
 
+	// SingleAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-linechartconfiguration.html#cfn-quicksight-dashboard-linechartconfiguration-singleaxisoptions
+	SingleAxisOptions *Dashboard_SingleAxisOptions `json:"SingleAxisOptions,omitempty"`
+
 	// SmallMultiplesOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-linechartconfiguration.html#cfn-quicksight-dashboard-linechartconfiguration-smallmultiplesoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_nestedfilter.go b/cloudformation/quicksight/aws-quicksight-dashboard_nestedfilter.go
new file mode 100644
index 0000000000..3778d08eae
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_nestedfilter.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_NestedFilter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.NestedFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-nestedfilter.html
+type Dashboard_NestedFilter struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-nestedfilter.html#cfn-quicksight-dashboard-nestedfilter-column
+	Column *Dashboard_ColumnIdentifier `json:"Column"`
+
+	// FilterId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-nestedfilter.html#cfn-quicksight-dashboard-nestedfilter-filterid
+	FilterId string `json:"FilterId"`
+
+	// IncludeInnerSet AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-nestedfilter.html#cfn-quicksight-dashboard-nestedfilter-includeinnerset
+	IncludeInnerSet bool `json:"IncludeInnerSet"`
+
+	// InnerFilter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-nestedfilter.html#cfn-quicksight-dashboard-nestedfilter-innerfilter
+	InnerFilter *Dashboard_InnerFilter `json:"InnerFilter"`
+
+	// 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_NestedFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.NestedFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_parameterdropdowncontrol.go b/cloudformation/quicksight/aws-quicksight-dashboard_parameterdropdowncontrol.go
index c4bad8ffbf..f28279c97a 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_parameterdropdowncontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_parameterdropdowncontrol.go
@@ -15,6 +15,11 @@ type Dashboard_ParameterDropDownControl struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameterdropdowncontrol.html#cfn-quicksight-dashboard-parameterdropdowncontrol-cascadingcontrolconfiguration
 	CascadingControlConfiguration *Dashboard_CascadingControlConfiguration `json:"CascadingControlConfiguration,omitempty"`
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameterdropdowncontrol.html#cfn-quicksight-dashboard-parameterdropdowncontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameterdropdowncontrol.html#cfn-quicksight-dashboard-parameterdropdowncontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_singleaxisoptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_singleaxisoptions.go
new file mode 100644
index 0000000000..68e645e532
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_singleaxisoptions.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_SingleAxisOptions AWS CloudFormation Resource (AWS::QuickSight::Dashboard.SingleAxisOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-singleaxisoptions.html
+type Dashboard_SingleAxisOptions struct {
+
+	// YAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-singleaxisoptions.html#cfn-quicksight-dashboard-singleaxisoptions-yaxisoptions
+	YAxisOptions *Dashboard_YAxisOptions `json:"YAxisOptions,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_SingleAxisOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.SingleAxisOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartcolorconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartcolorconfiguration.go
new file mode 100644
index 0000000000..f5d0e1e2aa
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartcolorconfiguration.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_WaterfallChartColorConfiguration AWS CloudFormation Resource (AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartcolorconfiguration.html
+type Dashboard_WaterfallChartColorConfiguration struct {
+
+	// GroupColorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartcolorconfiguration.html#cfn-quicksight-dashboard-waterfallchartcolorconfiguration-groupcolorconfiguration
+	GroupColorConfiguration *Dashboard_WaterfallChartGroupColorConfiguration `json:"GroupColorConfiguration,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_WaterfallChartColorConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartconfiguration.go
index 1055f9d97b..60ba049455 100644
--- a/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartconfiguration.go
@@ -20,6 +20,11 @@ type Dashboard_WaterfallChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartconfiguration.html#cfn-quicksight-dashboard-waterfallchartconfiguration-categoryaxislabeloptions
 	CategoryAxisLabelOptions *Dashboard_ChartAxisLabelOptions `json:"CategoryAxisLabelOptions,omitempty"`
 
+	// ColorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartconfiguration.html#cfn-quicksight-dashboard-waterfallchartconfiguration-colorconfiguration
+	ColorConfiguration *Dashboard_WaterfallChartColorConfiguration `json:"ColorConfiguration,omitempty"`
+
 	// DataLabels AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartconfiguration.html#cfn-quicksight-dashboard-waterfallchartconfiguration-datalabels
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartgroupcolorconfiguration.go b/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartgroupcolorconfiguration.go
new file mode 100644
index 0000000000..70f37f14c9
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_waterfallchartgroupcolorconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Dashboard_WaterfallChartGroupColorConfiguration AWS CloudFormation Resource (AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartgroupcolorconfiguration.html
+type Dashboard_WaterfallChartGroupColorConfiguration struct {
+
+	// NegativeBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-dashboard-waterfallchartgroupcolorconfiguration-negativebarcolor
+	NegativeBarColor *string `json:"NegativeBarColor,omitempty"`
+
+	// PositiveBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-dashboard-waterfallchartgroupcolorconfiguration-positivebarcolor
+	PositiveBarColor *string `json:"PositiveBarColor,omitempty"`
+
+	// TotalBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-dashboard-waterfallchartgroupcolorconfiguration-totalbarcolor
+	TotalBarColor *string `json:"TotalBarColor,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_WaterfallChartGroupColorConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dashboard_yaxisoptions.go b/cloudformation/quicksight/aws-quicksight-dashboard_yaxisoptions.go
new file mode 100644
index 0000000000..eb8d91b045
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dashboard_yaxisoptions.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_YAxisOptions AWS CloudFormation Resource (AWS::QuickSight::Dashboard.YAxisOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-yaxisoptions.html
+type Dashboard_YAxisOptions struct {
+
+	// YAxis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-yaxisoptions.html#cfn-quicksight-dashboard-yaxisoptions-yaxis
+	YAxis string `json:"YAxis"`
+
+	// 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_YAxisOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.YAxisOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-dataset.go b/cloudformation/quicksight/aws-quicksight-dataset.go
index 199d458151..c4262dcb44 100644
--- a/cloudformation/quicksight/aws-quicksight-dataset.go
+++ b/cloudformation/quicksight/aws-quicksight-dataset.go
@@ -54,6 +54,11 @@ type DataSet struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-fieldfolders
 	FieldFolders map[string]DataSet_FieldFolder `json:"FieldFolders,omitempty"`
 
+	// FolderArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-folderarns
+	FolderArns []string `json:"FolderArns,omitempty"`
+
 	// ImportMode AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-importmode
diff --git a/cloudformation/quicksight/aws-quicksight-dataset_incrementalrefresh.go b/cloudformation/quicksight/aws-quicksight-dataset_incrementalrefresh.go
index e5c6f49e5f..acc16f8ef7 100644
--- a/cloudformation/quicksight/aws-quicksight-dataset_incrementalrefresh.go
+++ b/cloudformation/quicksight/aws-quicksight-dataset_incrementalrefresh.go
@@ -11,9 +11,9 @@ import (
 type DataSet_IncrementalRefresh struct {
 
 	// LookbackWindow AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-incrementalrefresh.html#cfn-quicksight-dataset-incrementalrefresh-lookbackwindow
-	LookbackWindow *DataSet_LookbackWindow `json:"LookbackWindow,omitempty"`
+	LookbackWindow *DataSet_LookbackWindow `json:"LookbackWindow"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go b/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
index 577c11c07c..9153dd7508 100644
--- a/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
+++ b/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
@@ -21,9 +21,9 @@ type DataSet_LogicalTable struct {
 	DataTransforms []DataSet_TransformOperation `json:"DataTransforms,omitempty"`
 
 	// Source AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-logicaltable.html#cfn-quicksight-dataset-logicaltable-source
-	Source *DataSet_LogicalTableSource `json:"Source"`
+	Source *DataSet_LogicalTableSource `json:"Source,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/quicksight/aws-quicksight-dataset_lookbackwindow.go b/cloudformation/quicksight/aws-quicksight-dataset_lookbackwindow.go
index d038705085..79dc33085f 100644
--- a/cloudformation/quicksight/aws-quicksight-dataset_lookbackwindow.go
+++ b/cloudformation/quicksight/aws-quicksight-dataset_lookbackwindow.go
@@ -11,19 +11,19 @@ import (
 type DataSet_LookbackWindow struct {
 
 	// ColumnName AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-lookbackwindow.html#cfn-quicksight-dataset-lookbackwindow-columnname
-	ColumnName *string `json:"ColumnName,omitempty"`
+	ColumnName string `json:"ColumnName"`
 
 	// Size AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-lookbackwindow.html#cfn-quicksight-dataset-lookbackwindow-size
-	Size *float64 `json:"Size,omitempty"`
+	Size float64 `json:"Size"`
 
 	// SizeUnit AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-lookbackwindow.html#cfn-quicksight-dataset-lookbackwindow-sizeunit
-	SizeUnit *string `json:"SizeUnit,omitempty"`
+	SizeUnit string `json:"SizeUnit"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/quicksight/aws-quicksight-dataset_refreshconfiguration.go b/cloudformation/quicksight/aws-quicksight-dataset_refreshconfiguration.go
index 7cf00d6e81..71bfda0195 100644
--- a/cloudformation/quicksight/aws-quicksight-dataset_refreshconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-dataset_refreshconfiguration.go
@@ -11,9 +11,9 @@ import (
 type DataSet_RefreshConfiguration struct {
 
 	// IncrementalRefresh AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-refreshconfiguration.html#cfn-quicksight-dataset-refreshconfiguration-incrementalrefresh
-	IncrementalRefresh *DataSet_IncrementalRefresh `json:"IncrementalRefresh,omitempty"`
+	IncrementalRefresh *DataSet_IncrementalRefresh `json:"IncrementalRefresh"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go b/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
index 588d756157..2e55399af8 100644
--- a/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
+++ b/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
@@ -45,6 +45,11 @@ type DataSet_TransformOperation struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html#cfn-quicksight-dataset-transformoperation-tagcolumnoperation
 	TagColumnOperation *DataSet_TagColumnOperation `json:"TagColumnOperation,omitempty"`
 
+	// UntagColumnOperation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html#cfn-quicksight-dataset-transformoperation-untagcolumnoperation
+	UntagColumnOperation *DataSet_UntagColumnOperation `json:"UntagColumnOperation,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/quicksight/aws-quicksight-dataset_untagcolumnoperation.go b/cloudformation/quicksight/aws-quicksight-dataset_untagcolumnoperation.go
new file mode 100644
index 0000000000..52507a03a3
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-dataset_untagcolumnoperation.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"
+)
+
+// DataSet_UntagColumnOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.UntagColumnOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-untagcolumnoperation.html
+type DataSet_UntagColumnOperation struct {
+
+	// ColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-untagcolumnoperation.html#cfn-quicksight-dataset-untagcolumnoperation-columnname
+	ColumnName string `json:"ColumnName"`
+
+	// TagNames AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-untagcolumnoperation.html#cfn-quicksight-dataset-untagcolumnoperation-tagnames
+	TagNames []string `json:"TagNames"`
+
+	// 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 *DataSet_UntagColumnOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.UntagColumnOperation"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-datasource.go b/cloudformation/quicksight/aws-quicksight-datasource.go
index e1b1dbfbe3..336e614697 100644
--- a/cloudformation/quicksight/aws-quicksight-datasource.go
+++ b/cloudformation/quicksight/aws-quicksight-datasource.go
@@ -45,9 +45,9 @@ type DataSource struct {
 	ErrorInfo *DataSource_DataSourceErrorInfo `json:"ErrorInfo,omitempty"`
 
 	// Name AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-name
-	Name *string `json:"Name,omitempty"`
+	Name string `json:"Name"`
 
 	// Permissions AWS CloudFormation Property
 	// Required: false
@@ -65,9 +65,9 @@ type DataSource struct {
 	Tags []tags.Tag `json:"Tags,omitempty"`
 
 	// Type AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-type
-	Type *string `json:"Type,omitempty"`
+	Type string `json:"Type"`
 
 	// VpcConnectionProperties AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/quicksight/aws-quicksight-datasource_identitycenterconfiguration.go b/cloudformation/quicksight/aws-quicksight-datasource_identitycenterconfiguration.go
new file mode 100644
index 0000000000..b9fd1e1f9f
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-datasource_identitycenterconfiguration.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"
+)
+
+// DataSource_IdentityCenterConfiguration AWS CloudFormation Resource (AWS::QuickSight::DataSource.IdentityCenterConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-identitycenterconfiguration.html
+type DataSource_IdentityCenterConfiguration struct {
+
+	// EnableIdentityPropagation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-identitycenterconfiguration.html#cfn-quicksight-datasource-identitycenterconfiguration-enableidentitypropagation
+	EnableIdentityPropagation *bool `json:"EnableIdentityPropagation,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 *DataSource_IdentityCenterConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.IdentityCenterConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-datasource_redshiftiamparameters.go b/cloudformation/quicksight/aws-quicksight-datasource_redshiftiamparameters.go
new file mode 100644
index 0000000000..8f4793a1d1
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-datasource_redshiftiamparameters.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DataSource_RedshiftIAMParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.RedshiftIAMParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftiamparameters.html
+type DataSource_RedshiftIAMParameters struct {
+
+	// AutoCreateDatabaseUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftiamparameters.html#cfn-quicksight-datasource-redshiftiamparameters-autocreatedatabaseuser
+	AutoCreateDatabaseUser *bool `json:"AutoCreateDatabaseUser,omitempty"`
+
+	// DatabaseGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftiamparameters.html#cfn-quicksight-datasource-redshiftiamparameters-databasegroups
+	DatabaseGroups []string `json:"DatabaseGroups,omitempty"`
+
+	// DatabaseUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftiamparameters.html#cfn-quicksight-datasource-redshiftiamparameters-databaseuser
+	DatabaseUser *string `json:"DatabaseUser,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftiamparameters.html#cfn-quicksight-datasource-redshiftiamparameters-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_RedshiftIAMParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.RedshiftIAMParameters"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go b/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
index 15ebd6b0d5..f860d5d5b3 100644
--- a/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
+++ b/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
@@ -25,6 +25,16 @@ type DataSource_RedshiftParameters struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html#cfn-quicksight-datasource-redshiftparameters-host
 	Host *string `json:"Host,omitempty"`
 
+	// IAMParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html#cfn-quicksight-datasource-redshiftparameters-iamparameters
+	IAMParameters *DataSource_RedshiftIAMParameters `json:"IAMParameters,omitempty"`
+
+	// IdentityCenterConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html#cfn-quicksight-datasource-redshiftparameters-identitycenterconfiguration
+	IdentityCenterConfiguration *DataSource_IdentityCenterConfiguration `json:"IdentityCenterConfiguration,omitempty"`
+
 	// Port AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html#cfn-quicksight-datasource-redshiftparameters-port
diff --git a/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go b/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
index b4af5f116b..5b09278dd8 100644
--- a/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
+++ b/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
@@ -20,6 +20,11 @@ type DataSource_ResourcePermission struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-resourcepermission.html#cfn-quicksight-datasource-resourcepermission-principal
 	Principal string `json:"Principal"`
 
+	// Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-resourcepermission.html#cfn-quicksight-datasource-resourcepermission-resource
+	Resource *string `json:"Resource,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/quicksight/aws-quicksight-folder.go b/cloudformation/quicksight/aws-quicksight-folder.go
new file mode 100644
index 0000000000..f0765b3fe3
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-folder.go
@@ -0,0 +1,153 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Folder AWS CloudFormation Resource (AWS::QuickSight::Folder)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html
+type Folder struct {
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-awsaccountid
+	AwsAccountId *string `json:"AwsAccountId,omitempty"`
+
+	// FolderId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-folderid
+	FolderId *string `json:"FolderId,omitempty"`
+
+	// FolderType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-foldertype
+	FolderType *string `json:"FolderType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-name
+	Name *string `json:"Name,omitempty"`
+
+	// ParentFolderArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-parentfolderarn
+	ParentFolderArn *string `json:"ParentFolderArn,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-permissions
+	Permissions []Folder_ResourcePermission `json:"Permissions,omitempty"`
+
+	// SharingModel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-sharingmodel
+	SharingModel *string `json:"SharingModel,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-folder.html#cfn-quicksight-folder-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 *Folder) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Folder"
+}
+
+// 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 Folder) MarshalJSON() ([]byte, error) {
+	type Properties Folder
+	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 *Folder) UnmarshalJSON(b []byte) error {
+	type Properties Folder
+	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 = Folder(*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/quicksight/aws-quicksight-folder_resourcepermission.go b/cloudformation/quicksight/aws-quicksight-folder_resourcepermission.go
new file mode 100644
index 0000000000..e733abea10
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-folder_resourcepermission.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"
+)
+
+// Folder_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Folder.ResourcePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-folder-resourcepermission.html
+type Folder_ResourcePermission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-folder-resourcepermission.html#cfn-quicksight-folder-resourcepermission-actions
+	Actions []string `json:"Actions"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-folder-resourcepermission.html#cfn-quicksight-folder-resourcepermission-principal
+	Principal string `json:"Principal"`
+
+	// 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 *Folder_ResourcePermission) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Folder.ResourcePermission"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_categoryinnerfilter.go b/cloudformation/quicksight/aws-quicksight-template_categoryinnerfilter.go
new file mode 100644
index 0000000000..05229777a4
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_categoryinnerfilter.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_CategoryInnerFilter AWS CloudFormation Resource (AWS::QuickSight::Template.CategoryInnerFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-categoryinnerfilter.html
+type Template_CategoryInnerFilter struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-categoryinnerfilter.html#cfn-quicksight-template-categoryinnerfilter-column
+	Column *Template_ColumnIdentifier `json:"Column"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-categoryinnerfilter.html#cfn-quicksight-template-categoryinnerfilter-configuration
+	Configuration *Template_CategoryFilterConfiguration `json:"Configuration"`
+
+	// DefaultFilterControlConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-categoryinnerfilter.html#cfn-quicksight-template-categoryinnerfilter-defaultfiltercontrolconfiguration
+	DefaultFilterControlConfiguration *Template_DefaultFilterControlConfiguration `json:"DefaultFilterControlConfiguration,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_CategoryInnerFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.CategoryInnerFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_columntooltipitem.go b/cloudformation/quicksight/aws-quicksight-template_columntooltipitem.go
index 20e9630cbf..54fb7eb6e1 100644
--- a/cloudformation/quicksight/aws-quicksight-template_columntooltipitem.go
+++ b/cloudformation/quicksight/aws-quicksight-template_columntooltipitem.go
@@ -25,6 +25,11 @@ type Template_ColumnTooltipItem struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-columntooltipitem.html#cfn-quicksight-template-columntooltipitem-label
 	Label *string `json:"Label,omitempty"`
 
+	// TooltipTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-columntooltipitem.html#cfn-quicksight-template-columntooltipitem-tooltiptarget
+	TooltipTarget *string `json:"TooltipTarget,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-columntooltipitem.html#cfn-quicksight-template-columntooltipitem-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-template_combochartconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_combochartconfiguration.go
index 9c9d113838..13c89d555b 100644
--- a/cloudformation/quicksight/aws-quicksight-template_combochartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_combochartconfiguration.go
@@ -75,6 +75,11 @@ type Template_ComboChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-combochartconfiguration.html#cfn-quicksight-template-combochartconfiguration-secondaryyaxislabeloptions
 	SecondaryYAxisLabelOptions *Template_ChartAxisLabelOptions `json:"SecondaryYAxisLabelOptions,omitempty"`
 
+	// SingleAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-combochartconfiguration.html#cfn-quicksight-template-combochartconfiguration-singleaxisoptions
+	SingleAxisOptions *Template_SingleAxisOptions `json:"SingleAxisOptions,omitempty"`
+
 	// SortConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-combochartconfiguration.html#cfn-quicksight-template-combochartconfiguration-sortconfiguration
diff --git a/cloudformation/quicksight/aws-quicksight-template_defaultdatetimepickercontroloptions.go b/cloudformation/quicksight/aws-quicksight-template_defaultdatetimepickercontroloptions.go
index 53d5d3f74b..d30a912938 100644
--- a/cloudformation/quicksight/aws-quicksight-template_defaultdatetimepickercontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-template_defaultdatetimepickercontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultdatetimepickercontroloptions.html
 type Template_DefaultDateTimePickerControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultdatetimepickercontroloptions.html#cfn-quicksight-template-defaultdatetimepickercontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultdatetimepickercontroloptions.html#cfn-quicksight-template-defaultdatetimepickercontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_defaultfilterdropdowncontroloptions.go b/cloudformation/quicksight/aws-quicksight-template_defaultfilterdropdowncontroloptions.go
index fe6848c542..f35bd54362 100644
--- a/cloudformation/quicksight/aws-quicksight-template_defaultfilterdropdowncontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-template_defaultfilterdropdowncontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultfilterdropdowncontroloptions.html
 type Template_DefaultFilterDropDownControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultfilterdropdowncontroloptions.html#cfn-quicksight-template-defaultfilterdropdowncontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultfilterdropdowncontroloptions.html#cfn-quicksight-template-defaultfilterdropdowncontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_defaultrelativedatetimecontroloptions.go b/cloudformation/quicksight/aws-quicksight-template_defaultrelativedatetimecontroloptions.go
index 959a217cb3..802e527710 100644
--- a/cloudformation/quicksight/aws-quicksight-template_defaultrelativedatetimecontroloptions.go
+++ b/cloudformation/quicksight/aws-quicksight-template_defaultrelativedatetimecontroloptions.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultrelativedatetimecontroloptions.html
 type Template_DefaultRelativeDateTimeControlOptions struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultrelativedatetimecontroloptions.html#cfn-quicksight-template-defaultrelativedatetimecontroloptions-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-defaultrelativedatetimecontroloptions.html#cfn-quicksight-template-defaultrelativedatetimecontroloptions-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_fieldtooltipitem.go b/cloudformation/quicksight/aws-quicksight-template_fieldtooltipitem.go
index 3b041c28c5..8639a85557 100644
--- a/cloudformation/quicksight/aws-quicksight-template_fieldtooltipitem.go
+++ b/cloudformation/quicksight/aws-quicksight-template_fieldtooltipitem.go
@@ -20,6 +20,11 @@ type Template_FieldTooltipItem struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-fieldtooltipitem.html#cfn-quicksight-template-fieldtooltipitem-label
 	Label *string `json:"Label,omitempty"`
 
+	// TooltipTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-fieldtooltipitem.html#cfn-quicksight-template-fieldtooltipitem-tooltiptarget
+	TooltipTarget *string `json:"TooltipTarget,omitempty"`
+
 	// Visibility AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-fieldtooltipitem.html#cfn-quicksight-template-fieldtooltipitem-visibility
diff --git a/cloudformation/quicksight/aws-quicksight-template_filter.go b/cloudformation/quicksight/aws-quicksight-template_filter.go
index 77a8a595eb..08a196a4ed 100644
--- a/cloudformation/quicksight/aws-quicksight-template_filter.go
+++ b/cloudformation/quicksight/aws-quicksight-template_filter.go
@@ -15,6 +15,11 @@ type Template_Filter struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filter.html#cfn-quicksight-template-filter-categoryfilter
 	CategoryFilter *Template_CategoryFilter `json:"CategoryFilter,omitempty"`
 
+	// NestedFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filter.html#cfn-quicksight-template-filter-nestedfilter
+	NestedFilter *Template_NestedFilter `json:"NestedFilter,omitempty"`
+
 	// NumericEqualityFilter AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filter.html#cfn-quicksight-template-filter-numericequalityfilter
diff --git a/cloudformation/quicksight/aws-quicksight-template_filterdatetimepickercontrol.go b/cloudformation/quicksight/aws-quicksight-template_filterdatetimepickercontrol.go
index 3c08685824..2f65fcdd9e 100644
--- a/cloudformation/quicksight/aws-quicksight-template_filterdatetimepickercontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-template_filterdatetimepickercontrol.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterdatetimepickercontrol.html
 type Template_FilterDateTimePickerControl struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterdatetimepickercontrol.html#cfn-quicksight-template-filterdatetimepickercontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterdatetimepickercontrol.html#cfn-quicksight-template-filterdatetimepickercontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_filterdropdowncontrol.go b/cloudformation/quicksight/aws-quicksight-template_filterdropdowncontrol.go
index 0fef476699..42b622e233 100644
--- a/cloudformation/quicksight/aws-quicksight-template_filterdropdowncontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-template_filterdropdowncontrol.go
@@ -15,6 +15,11 @@ type Template_FilterDropDownControl struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterdropdowncontrol.html#cfn-quicksight-template-filterdropdowncontrol-cascadingcontrolconfiguration
 	CascadingControlConfiguration *Template_CascadingControlConfiguration `json:"CascadingControlConfiguration,omitempty"`
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterdropdowncontrol.html#cfn-quicksight-template-filterdropdowncontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterdropdowncontrol.html#cfn-quicksight-template-filterdropdowncontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_filterrelativedatetimecontrol.go b/cloudformation/quicksight/aws-quicksight-template_filterrelativedatetimecontrol.go
index 7e6b3ca0c1..71180c61e1 100644
--- a/cloudformation/quicksight/aws-quicksight-template_filterrelativedatetimecontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-template_filterrelativedatetimecontrol.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterrelativedatetimecontrol.html
 type Template_FilterRelativeDateTimeControl struct {
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterrelativedatetimecontrol.html#cfn-quicksight-template-filterrelativedatetimecontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-filterrelativedatetimecontrol.html#cfn-quicksight-template-filterrelativedatetimecontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_innerfilter.go b/cloudformation/quicksight/aws-quicksight-template_innerfilter.go
new file mode 100644
index 0000000000..f59894ba65
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_innerfilter.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_InnerFilter AWS CloudFormation Resource (AWS::QuickSight::Template.InnerFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-innerfilter.html
+type Template_InnerFilter struct {
+
+	// CategoryInnerFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-innerfilter.html#cfn-quicksight-template-innerfilter-categoryinnerfilter
+	CategoryInnerFilter *Template_CategoryInnerFilter `json:"CategoryInnerFilter,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_InnerFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.InnerFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_linechartconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_linechartconfiguration.go
index e38393228c..4923df1c00 100644
--- a/cloudformation/quicksight/aws-quicksight-template_linechartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_linechartconfiguration.go
@@ -70,6 +70,11 @@ type Template_LineChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-linechartconfiguration.html#cfn-quicksight-template-linechartconfiguration-series
 	Series []Template_SeriesItem `json:"Series,omitempty"`
 
+	// SingleAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-linechartconfiguration.html#cfn-quicksight-template-linechartconfiguration-singleaxisoptions
+	SingleAxisOptions *Template_SingleAxisOptions `json:"SingleAxisOptions,omitempty"`
+
 	// SmallMultiplesOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-linechartconfiguration.html#cfn-quicksight-template-linechartconfiguration-smallmultiplesoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_nestedfilter.go b/cloudformation/quicksight/aws-quicksight-template_nestedfilter.go
new file mode 100644
index 0000000000..b71fa345fd
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_nestedfilter.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_NestedFilter AWS CloudFormation Resource (AWS::QuickSight::Template.NestedFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-nestedfilter.html
+type Template_NestedFilter struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-nestedfilter.html#cfn-quicksight-template-nestedfilter-column
+	Column *Template_ColumnIdentifier `json:"Column"`
+
+	// FilterId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-nestedfilter.html#cfn-quicksight-template-nestedfilter-filterid
+	FilterId string `json:"FilterId"`
+
+	// IncludeInnerSet AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-nestedfilter.html#cfn-quicksight-template-nestedfilter-includeinnerset
+	IncludeInnerSet bool `json:"IncludeInnerSet"`
+
+	// InnerFilter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-nestedfilter.html#cfn-quicksight-template-nestedfilter-innerfilter
+	InnerFilter *Template_InnerFilter `json:"InnerFilter"`
+
+	// 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_NestedFilter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.NestedFilter"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_parameterdropdowncontrol.go b/cloudformation/quicksight/aws-quicksight-template_parameterdropdowncontrol.go
index 472f19be6f..6bac3f91ad 100644
--- a/cloudformation/quicksight/aws-quicksight-template_parameterdropdowncontrol.go
+++ b/cloudformation/quicksight/aws-quicksight-template_parameterdropdowncontrol.go
@@ -15,6 +15,11 @@ type Template_ParameterDropDownControl struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-parameterdropdowncontrol.html#cfn-quicksight-template-parameterdropdowncontrol-cascadingcontrolconfiguration
 	CascadingControlConfiguration *Template_CascadingControlConfiguration `json:"CascadingControlConfiguration,omitempty"`
 
+	// CommitMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-parameterdropdowncontrol.html#cfn-quicksight-template-parameterdropdowncontrol-commitmode
+	CommitMode *string `json:"CommitMode,omitempty"`
+
 	// DisplayOptions AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-parameterdropdowncontrol.html#cfn-quicksight-template-parameterdropdowncontrol-displayoptions
diff --git a/cloudformation/quicksight/aws-quicksight-template_queryexecutionoptions.go b/cloudformation/quicksight/aws-quicksight-template_queryexecutionoptions.go
new file mode 100644
index 0000000000..ccdbb89254
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_queryexecutionoptions.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_QueryExecutionOptions AWS CloudFormation Resource (AWS::QuickSight::Template.QueryExecutionOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-queryexecutionoptions.html
+type Template_QueryExecutionOptions struct {
+
+	// QueryExecutionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-queryexecutionoptions.html#cfn-quicksight-template-queryexecutionoptions-queryexecutionmode
+	QueryExecutionMode *string `json:"QueryExecutionMode,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_QueryExecutionOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.QueryExecutionOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_singleaxisoptions.go b/cloudformation/quicksight/aws-quicksight-template_singleaxisoptions.go
new file mode 100644
index 0000000000..8ea0f94995
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_singleaxisoptions.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_SingleAxisOptions AWS CloudFormation Resource (AWS::QuickSight::Template.SingleAxisOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-singleaxisoptions.html
+type Template_SingleAxisOptions struct {
+
+	// YAxisOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-singleaxisoptions.html#cfn-quicksight-template-singleaxisoptions-yaxisoptions
+	YAxisOptions *Template_YAxisOptions `json:"YAxisOptions,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_SingleAxisOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.SingleAxisOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_templateversiondefinition.go b/cloudformation/quicksight/aws-quicksight-template_templateversiondefinition.go
index a550733375..f76a186485 100644
--- a/cloudformation/quicksight/aws-quicksight-template_templateversiondefinition.go
+++ b/cloudformation/quicksight/aws-quicksight-template_templateversiondefinition.go
@@ -45,6 +45,11 @@ type Template_TemplateVersionDefinition struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templateversiondefinition.html#cfn-quicksight-template-templateversiondefinition-parameterdeclarations
 	ParameterDeclarations []Template_ParameterDeclaration `json:"ParameterDeclarations,omitempty"`
 
+	// QueryExecutionOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templateversiondefinition.html#cfn-quicksight-template-templateversiondefinition-queryexecutionoptions
+	QueryExecutionOptions *Template_QueryExecutionOptions `json:"QueryExecutionOptions,omitempty"`
+
 	// Sheets AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templateversiondefinition.html#cfn-quicksight-template-templateversiondefinition-sheets
diff --git a/cloudformation/quicksight/aws-quicksight-template_waterfallchartcolorconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_waterfallchartcolorconfiguration.go
new file mode 100644
index 0000000000..39d68064af
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_waterfallchartcolorconfiguration.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_WaterfallChartColorConfiguration AWS CloudFormation Resource (AWS::QuickSight::Template.WaterfallChartColorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartcolorconfiguration.html
+type Template_WaterfallChartColorConfiguration struct {
+
+	// GroupColorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartcolorconfiguration.html#cfn-quicksight-template-waterfallchartcolorconfiguration-groupcolorconfiguration
+	GroupColorConfiguration *Template_WaterfallChartGroupColorConfiguration `json:"GroupColorConfiguration,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_WaterfallChartColorConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.WaterfallChartColorConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_waterfallchartconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_waterfallchartconfiguration.go
index 1b60bace49..7a18a4500a 100644
--- a/cloudformation/quicksight/aws-quicksight-template_waterfallchartconfiguration.go
+++ b/cloudformation/quicksight/aws-quicksight-template_waterfallchartconfiguration.go
@@ -20,6 +20,11 @@ type Template_WaterfallChartConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartconfiguration.html#cfn-quicksight-template-waterfallchartconfiguration-categoryaxislabeloptions
 	CategoryAxisLabelOptions *Template_ChartAxisLabelOptions `json:"CategoryAxisLabelOptions,omitempty"`
 
+	// ColorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartconfiguration.html#cfn-quicksight-template-waterfallchartconfiguration-colorconfiguration
+	ColorConfiguration *Template_WaterfallChartColorConfiguration `json:"ColorConfiguration,omitempty"`
+
 	// DataLabels AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartconfiguration.html#cfn-quicksight-template-waterfallchartconfiguration-datalabels
diff --git a/cloudformation/quicksight/aws-quicksight-template_waterfallchartgroupcolorconfiguration.go b/cloudformation/quicksight/aws-quicksight-template_waterfallchartgroupcolorconfiguration.go
new file mode 100644
index 0000000000..6d2b886d5b
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_waterfallchartgroupcolorconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package quicksight
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Template_WaterfallChartGroupColorConfiguration AWS CloudFormation Resource (AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartgroupcolorconfiguration.html
+type Template_WaterfallChartGroupColorConfiguration struct {
+
+	// NegativeBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-template-waterfallchartgroupcolorconfiguration-negativebarcolor
+	NegativeBarColor *string `json:"NegativeBarColor,omitempty"`
+
+	// PositiveBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-template-waterfallchartgroupcolorconfiguration-positivebarcolor
+	PositiveBarColor *string `json:"PositiveBarColor,omitempty"`
+
+	// TotalBarColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-waterfallchartgroupcolorconfiguration.html#cfn-quicksight-template-waterfallchartgroupcolorconfiguration-totalbarcolor
+	TotalBarColor *string `json:"TotalBarColor,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_WaterfallChartGroupColorConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-template_yaxisoptions.go b/cloudformation/quicksight/aws-quicksight-template_yaxisoptions.go
new file mode 100644
index 0000000000..63ebc07914
--- /dev/null
+++ b/cloudformation/quicksight/aws-quicksight-template_yaxisoptions.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_YAxisOptions AWS CloudFormation Resource (AWS::QuickSight::Template.YAxisOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-yaxisoptions.html
+type Template_YAxisOptions struct {
+
+	// YAxis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-yaxisoptions.html#cfn-quicksight-template-yaxisoptions-yaxis
+	YAxis string `json:"YAxis"`
+
+	// 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_YAxisOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.YAxisOptions"
+}
diff --git a/cloudformation/quicksight/aws-quicksight-topic_topiccalculatedfield.go b/cloudformation/quicksight/aws-quicksight-topic_topiccalculatedfield.go
index bc6607aa25..8928890b8f 100644
--- a/cloudformation/quicksight/aws-quicksight-topic_topiccalculatedfield.go
+++ b/cloudformation/quicksight/aws-quicksight-topic_topiccalculatedfield.go
@@ -55,6 +55,11 @@ type Topic_TopicCalculatedField struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-topic-topiccalculatedfield.html#cfn-quicksight-topic-topiccalculatedfield-defaultformatting
 	DefaultFormatting *Topic_DefaultFormatting `json:"DefaultFormatting,omitempty"`
 
+	// DisableIndexing AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-topic-topiccalculatedfield.html#cfn-quicksight-topic-topiccalculatedfield-disableindexing
+	DisableIndexing *bool `json:"DisableIndexing,omitempty"`
+
 	// Expression AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-topic-topiccalculatedfield.html#cfn-quicksight-topic-topiccalculatedfield-expression
diff --git a/cloudformation/quicksight/aws-quicksight-topic_topiccolumn.go b/cloudformation/quicksight/aws-quicksight-topic_topiccolumn.go
index bbd6d50ac1..cecbbbda20 100644
--- a/cloudformation/quicksight/aws-quicksight-topic_topiccolumn.go
+++ b/cloudformation/quicksight/aws-quicksight-topic_topiccolumn.go
@@ -60,6 +60,11 @@ type Topic_TopicColumn struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-topic-topiccolumn.html#cfn-quicksight-topic-topiccolumn-defaultformatting
 	DefaultFormatting *Topic_DefaultFormatting `json:"DefaultFormatting,omitempty"`
 
+	// DisableIndexing AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-topic-topiccolumn.html#cfn-quicksight-topic-topiccolumn-disableindexing
+	DisableIndexing *bool `json:"DisableIndexing,omitempty"`
+
 	// IsIncludedInTopic AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-topic-topiccolumn.html#cfn-quicksight-topic-topiccolumn-isincludedintopic
diff --git a/cloudformation/rds/aws-rds-dbcluster.go b/cloudformation/rds/aws-rds-dbcluster.go
index 95c6596b25..2957bfe3ca 100644
--- a/cloudformation/rds/aws-rds-dbcluster.go
+++ b/cloudformation/rds/aws-rds-dbcluster.go
@@ -119,11 +119,21 @@ type DBCluster struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enableiamdatabaseauthentication
 	EnableIAMDatabaseAuthentication *bool `json:"EnableIAMDatabaseAuthentication,omitempty"`
 
+	// EnableLocalWriteForwarding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enablelocalwriteforwarding
+	EnableLocalWriteForwarding *bool `json:"EnableLocalWriteForwarding,omitempty"`
+
 	// Engine AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-engine
 	Engine *string `json:"Engine,omitempty"`
 
+	// EngineLifecycleSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enginelifecyclesupport
+	EngineLifecycleSupport *string `json:"EngineLifecycleSupport,omitempty"`
+
 	// EngineMode AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enginemode
diff --git a/cloudformation/rds/aws-rds-dbinstance.go b/cloudformation/rds/aws-rds-dbinstance.go
index 30a00a4ae1..1ac507a696 100644
--- a/cloudformation/rds/aws-rds-dbinstance.go
+++ b/cloudformation/rds/aws-rds-dbinstance.go
@@ -199,6 +199,11 @@ type DBInstance struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-engine
 	Engine *string `json:"Engine,omitempty"`
 
+	// EngineLifecycleSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-enginelifecyclesupport
+	EngineLifecycleSupport *string `json:"EngineLifecycleSupport,omitempty"`
+
 	// EngineVersion AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbinstance.html#cfn-rds-dbinstance-engineversion
diff --git a/cloudformation/rds/aws-rds-globalcluster.go b/cloudformation/rds/aws-rds-globalcluster.go
index f00dee25fc..b2ce5fe84e 100644
--- a/cloudformation/rds/aws-rds-globalcluster.go
+++ b/cloudformation/rds/aws-rds-globalcluster.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // GlobalCluster AWS CloudFormation Resource (AWS::RDS::GlobalCluster)
@@ -23,6 +24,11 @@ type GlobalCluster struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-engine
 	Engine *string `json:"Engine,omitempty"`
 
+	// EngineLifecycleSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-enginelifecyclesupport
+	EngineLifecycleSupport *string `json:"EngineLifecycleSupport,omitempty"`
+
 	// EngineVersion AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-engineversion
@@ -43,6 +49,11 @@ type GlobalCluster struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-storageencrypted
 	StorageEncrypted *bool `json:"StorageEncrypted,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go b/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
index 5aef2e2884..75cc99a082 100644
--- a/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
+++ b/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
@@ -15,6 +15,16 @@ type Cluster_LoggingProperties struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html#cfn-redshift-cluster-loggingproperties-bucketname
 	BucketName *string `json:"BucketName,omitempty"`
 
+	// LogDestinationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html#cfn-redshift-cluster-loggingproperties-logdestinationtype
+	LogDestinationType *string `json:"LogDestinationType,omitempty"`
+
+	// LogExports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html#cfn-redshift-cluster-loggingproperties-logexports
+	LogExports []string `json:"LogExports,omitempty"`
+
 	// S3KeyPrefix AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html#cfn-redshift-cluster-loggingproperties-s3keyprefix
diff --git a/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go b/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
index 84f234a1ec..b2635cc8f2 100644
--- a/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
+++ b/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
@@ -14,6 +14,16 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html
 type Profile struct {
 
+	// AcceptRoleSessionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-acceptrolesessionname
+	AcceptRoleSessionName *bool `json:"AcceptRoleSessionName,omitempty"`
+
+	// AttributeMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-attributemappings
+	AttributeMappings []Profile_AttributeMapping `json:"AttributeMappings,omitempty"`
+
 	// DurationSeconds AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-durationseconds
diff --git a/cloudformation/rolesanywhere/aws-rolesanywhere-profile_attributemapping.go b/cloudformation/rolesanywhere/aws-rolesanywhere-profile_attributemapping.go
new file mode 100644
index 0000000000..e305196f8e
--- /dev/null
+++ b/cloudformation/rolesanywhere/aws-rolesanywhere-profile_attributemapping.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Profile_AttributeMapping AWS CloudFormation Resource (AWS::RolesAnywhere::Profile.AttributeMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-profile-attributemapping.html
+type Profile_AttributeMapping struct {
+
+	// CertificateField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-profile-attributemapping.html#cfn-rolesanywhere-profile-attributemapping-certificatefield
+	CertificateField string `json:"CertificateField"`
+
+	// MappingRules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-profile-attributemapping.html#cfn-rolesanywhere-profile-attributemapping-mappingrules
+	MappingRules []Profile_MappingRule `json:"MappingRules"`
+
+	// 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 *Profile_AttributeMapping) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::Profile.AttributeMapping"
+}
diff --git a/cloudformation/rolesanywhere/aws-rolesanywhere-profile_mappingrule.go b/cloudformation/rolesanywhere/aws-rolesanywhere-profile_mappingrule.go
new file mode 100644
index 0000000000..9336df4fd6
--- /dev/null
+++ b/cloudformation/rolesanywhere/aws-rolesanywhere-profile_mappingrule.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Profile_MappingRule AWS CloudFormation Resource (AWS::RolesAnywhere::Profile.MappingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-profile-mappingrule.html
+type Profile_MappingRule struct {
+
+	// Specifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-profile-mappingrule.html#cfn-rolesanywhere-profile-mappingrule-specifier
+	Specifier string `json:"Specifier"`
+
+	// 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 *Profile_MappingRule) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::Profile.MappingRule"
+}
diff --git a/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go b/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
index 82c80a42c0..cc561270a4 100644
--- a/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
+++ b/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
@@ -40,6 +40,11 @@ type FirewallRuleGroup_FirewallRule struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-firewalldomainlistid
 	FirewallDomainListId string `json:"FirewallDomainListId"`
 
+	// FirewallDomainRedirectionAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-firewalldomainredirectionaction
+	FirewallDomainRedirectionAction *string `json:"FirewallDomainRedirectionAction,omitempty"`
+
 	// Priority AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-priority
diff --git a/cloudformation/route53resolver/aws-route53resolver-resolverrule.go b/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
index 5488aa13d0..49d731c4cb 100644
--- a/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
+++ b/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
@@ -14,10 +14,15 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html
 type ResolverRule struct {
 
+	// DelegationRecord AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-delegationrecord
+	DelegationRecord *string `json:"DelegationRecord,omitempty"`
+
 	// DomainName AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-domainname
-	DomainName string `json:"DomainName"`
+	DomainName *string `json:"DomainName,omitempty"`
 
 	// Name AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go b/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
index 9379fd169e..4e0e21914d 100644
--- a/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
+++ b/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
@@ -15,6 +15,11 @@ type Bucket_LifecycleConfiguration struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfiguration.html#cfn-s3-bucket-lifecycleconfiguration-rules
 	Rules []Bucket_Rule `json:"Rules"`
 
+	// TransitionDefaultMinimumObjectSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfiguration.html#cfn-s3-bucket-lifecycleconfiguration-transitiondefaultminimumobjectsize
+	TransitionDefaultMinimumObjectSize *string `json:"TransitionDefaultMinimumObjectSize,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/s3express/aws-s3express-directorybucket.go b/cloudformation/s3express/aws-s3express-directorybucket.go
index 7111be48d7..260f64578f 100644
--- a/cloudformation/s3express/aws-s3express-directorybucket.go
+++ b/cloudformation/s3express/aws-s3express-directorybucket.go
@@ -13,6 +13,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-directorybucket.html
 type DirectoryBucket struct {
 
+	// BucketEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-directorybucket.html#cfn-s3express-directorybucket-bucketencryption
+	BucketEncryption *DirectoryBucket_BucketEncryption `json:"BucketEncryption,omitempty"`
+
 	// BucketName AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3express-directorybucket.html#cfn-s3express-directorybucket-bucketname
diff --git a/cloudformation/s3express/aws-s3express-directorybucket_bucketencryption.go b/cloudformation/s3express/aws-s3express-directorybucket_bucketencryption.go
new file mode 100644
index 0000000000..36651d1dd0
--- /dev/null
+++ b/cloudformation/s3express/aws-s3express-directorybucket_bucketencryption.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package s3express
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DirectoryBucket_BucketEncryption AWS CloudFormation Resource (AWS::S3Express::DirectoryBucket.BucketEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-bucketencryption.html
+type DirectoryBucket_BucketEncryption struct {
+
+	// ServerSideEncryptionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-bucketencryption.html#cfn-s3express-directorybucket-bucketencryption-serversideencryptionconfiguration
+	ServerSideEncryptionConfiguration []DirectoryBucket_ServerSideEncryptionRule `json:"ServerSideEncryptionConfiguration"`
+
+	// 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 *DirectoryBucket_BucketEncryption) AWSCloudFormationType() string {
+	return "AWS::S3Express::DirectoryBucket.BucketEncryption"
+}
diff --git a/cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionbydefault.go b/cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionbydefault.go
new file mode 100644
index 0000000000..921d3010f1
--- /dev/null
+++ b/cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionbydefault.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package s3express
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DirectoryBucket_ServerSideEncryptionByDefault AWS CloudFormation Resource (AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-serversideencryptionbydefault.html
+type DirectoryBucket_ServerSideEncryptionByDefault struct {
+
+	// KMSMasterKeyID AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-serversideencryptionbydefault.html#cfn-s3express-directorybucket-serversideencryptionbydefault-kmsmasterkeyid
+	KMSMasterKeyID *string `json:"KMSMasterKeyID,omitempty"`
+
+	// SSEAlgorithm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-serversideencryptionbydefault.html#cfn-s3express-directorybucket-serversideencryptionbydefault-ssealgorithm
+	SSEAlgorithm string `json:"SSEAlgorithm"`
+
+	// 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 *DirectoryBucket_ServerSideEncryptionByDefault) AWSCloudFormationType() string {
+	return "AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault"
+}
diff --git a/cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionrule.go b/cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionrule.go
new file mode 100644
index 0000000000..bc94eb605b
--- /dev/null
+++ b/cloudformation/s3express/aws-s3express-directorybucket_serversideencryptionrule.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package s3express
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// DirectoryBucket_ServerSideEncryptionRule AWS CloudFormation Resource (AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-serversideencryptionrule.html
+type DirectoryBucket_ServerSideEncryptionRule struct {
+
+	// BucketKeyEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-serversideencryptionrule.html#cfn-s3express-directorybucket-serversideencryptionrule-bucketkeyenabled
+	BucketKeyEnabled *bool `json:"BucketKeyEnabled,omitempty"`
+
+	// ServerSideEncryptionByDefault AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3express-directorybucket-serversideencryptionrule.html#cfn-s3express-directorybucket-serversideencryptionrule-serversideencryptionbydefault
+	ServerSideEncryptionByDefault *DirectoryBucket_ServerSideEncryptionByDefault `json:"ServerSideEncryptionByDefault,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 *DirectoryBucket_ServerSideEncryptionRule) AWSCloudFormationType() string {
+	return "AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go b/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
index 14316b3fd3..e766531410 100644
--- a/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
+++ b/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
@@ -15,6 +15,11 @@ type App_ResourceSpec struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-app-resourcespec.html#cfn-sagemaker-app-resourcespec-instancetype
 	InstanceType *string `json:"InstanceType,omitempty"`
 
+	// LifecycleConfigArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-app-resourcespec.html#cfn-sagemaker-app-resourcespec-lifecycleconfigarn
+	LifecycleConfigArn *string `json:"LifecycleConfigArn,omitempty"`
+
 	// SageMakerImageArn AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-app-resourcespec.html#cfn-sagemaker-app-resourcespec-sagemakerimagearn
diff --git a/cloudformation/sagemaker/aws-sagemaker-cluster.go b/cloudformation/sagemaker/aws-sagemaker-cluster.go
new file mode 100644
index 0000000000..59afa06c43
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster.go
@@ -0,0 +1,143 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::SageMaker::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html
+type Cluster struct {
+
+	// ClusterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html#cfn-sagemaker-cluster-clustername
+	ClusterName *string `json:"ClusterName,omitempty"`
+
+	// InstanceGroups AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html#cfn-sagemaker-cluster-instancegroups
+	InstanceGroups []Cluster_ClusterInstanceGroup `json:"InstanceGroups"`
+
+	// NodeRecovery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html#cfn-sagemaker-cluster-noderecovery
+	NodeRecovery *string `json:"NodeRecovery,omitempty"`
+
+	// Orchestrator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html#cfn-sagemaker-cluster-orchestrator
+	Orchestrator *Cluster_Orchestrator `json:"Orchestrator,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html#cfn-sagemaker-cluster-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-cluster.html#cfn-sagemaker-cluster-vpcconfig
+	VpcConfig *Cluster_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 *Cluster) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster"
+}
+
+// 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 Cluster) MarshalJSON() ([]byte, error) {
+	type Properties Cluster
+	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 *Cluster) UnmarshalJSON(b []byte) error {
+	type Properties Cluster
+	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 = Cluster(*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/sagemaker/aws-sagemaker-cluster_clusterebsvolumeconfig.go b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterebsvolumeconfig.go
new file mode 100644
index 0000000000..4fb3aa3a9a
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterebsvolumeconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ClusterEbsVolumeConfig AWS CloudFormation Resource (AWS::SageMaker::Cluster.ClusterEbsVolumeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterebsvolumeconfig.html
+type Cluster_ClusterEbsVolumeConfig struct {
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterebsvolumeconfig.html#cfn-sagemaker-cluster-clusterebsvolumeconfig-volumesizeingb
+	VolumeSizeInGB *int `json:"VolumeSizeInGB,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 *Cluster_ClusterEbsVolumeConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster.ClusterEbsVolumeConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancegroup.go b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancegroup.go
new file mode 100644
index 0000000000..f7090ccaa7
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancegroup.go
@@ -0,0 +1,77 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ClusterInstanceGroup AWS CloudFormation Resource (AWS::SageMaker::Cluster.ClusterInstanceGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html
+type Cluster_ClusterInstanceGroup struct {
+
+	// CurrentCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-currentcount
+	CurrentCount *int `json:"CurrentCount,omitempty"`
+
+	// ExecutionRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-executionrole
+	ExecutionRole string `json:"ExecutionRole"`
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-instancecount
+	InstanceCount int `json:"InstanceCount"`
+
+	// InstanceGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-instancegroupname
+	InstanceGroupName string `json:"InstanceGroupName"`
+
+	// InstanceStorageConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-instancestorageconfigs
+	InstanceStorageConfigs []Cluster_ClusterInstanceStorageConfig `json:"InstanceStorageConfigs,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-instancetype
+	InstanceType string `json:"InstanceType"`
+
+	// LifeCycleConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-lifecycleconfig
+	LifeCycleConfig *Cluster_ClusterLifeCycleConfig `json:"LifeCycleConfig"`
+
+	// OnStartDeepHealthChecks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-onstartdeephealthchecks
+	OnStartDeepHealthChecks []string `json:"OnStartDeepHealthChecks,omitempty"`
+
+	// ThreadsPerCore AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancegroup.html#cfn-sagemaker-cluster-clusterinstancegroup-threadspercore
+	ThreadsPerCore *int `json:"ThreadsPerCore,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 *Cluster_ClusterInstanceGroup) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster.ClusterInstanceGroup"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancestorageconfig.go b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancestorageconfig.go
new file mode 100644
index 0000000000..61c7e1844d
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterinstancestorageconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ClusterInstanceStorageConfig AWS CloudFormation Resource (AWS::SageMaker::Cluster.ClusterInstanceStorageConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancestorageconfig.html
+type Cluster_ClusterInstanceStorageConfig struct {
+
+	// EbsVolumeConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterinstancestorageconfig.html#cfn-sagemaker-cluster-clusterinstancestorageconfig-ebsvolumeconfig
+	EbsVolumeConfig *Cluster_ClusterEbsVolumeConfig `json:"EbsVolumeConfig,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 *Cluster_ClusterInstanceStorageConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster.ClusterInstanceStorageConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-cluster_clusterlifecycleconfig.go b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterlifecycleconfig.go
new file mode 100644
index 0000000000..d20cd05520
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterlifecycleconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ClusterLifeCycleConfig AWS CloudFormation Resource (AWS::SageMaker::Cluster.ClusterLifeCycleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterlifecycleconfig.html
+type Cluster_ClusterLifeCycleConfig struct {
+
+	// OnCreate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterlifecycleconfig.html#cfn-sagemaker-cluster-clusterlifecycleconfig-oncreate
+	OnCreate string `json:"OnCreate"`
+
+	// SourceS3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterlifecycleconfig.html#cfn-sagemaker-cluster-clusterlifecycleconfig-sources3uri
+	SourceS3Uri string `json:"SourceS3Uri"`
+
+	// 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 *Cluster_ClusterLifeCycleConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster.ClusterLifeCycleConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-cluster_clusterorchestratoreksconfig.go b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterorchestratoreksconfig.go
new file mode 100644
index 0000000000..ae3cec17e7
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster_clusterorchestratoreksconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_ClusterOrchestratorEksConfig AWS CloudFormation Resource (AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterorchestratoreksconfig.html
+type Cluster_ClusterOrchestratorEksConfig struct {
+
+	// ClusterArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-clusterorchestratoreksconfig.html#cfn-sagemaker-cluster-clusterorchestratoreksconfig-clusterarn
+	ClusterArn string `json:"ClusterArn"`
+
+	// 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 *Cluster_ClusterOrchestratorEksConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-cluster_orchestrator.go b/cloudformation/sagemaker/aws-sagemaker-cluster_orchestrator.go
new file mode 100644
index 0000000000..2dda587f24
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster_orchestrator.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_Orchestrator AWS CloudFormation Resource (AWS::SageMaker::Cluster.Orchestrator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-orchestrator.html
+type Cluster_Orchestrator struct {
+
+	// Eks AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-orchestrator.html#cfn-sagemaker-cluster-orchestrator-eks
+	Eks *Cluster_ClusterOrchestratorEksConfig `json:"Eks"`
+
+	// 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 *Cluster_Orchestrator) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster.Orchestrator"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-cluster_vpcconfig.go b/cloudformation/sagemaker/aws-sagemaker-cluster_vpcconfig.go
new file mode 100644
index 0000000000..f21fc21b50
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-cluster_vpcconfig.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Cluster_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::Cluster.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-vpcconfig.html
+type Cluster_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-vpcconfig.html#cfn-sagemaker-cluster-vpcconfig-securitygroupids
+	SecurityGroupIds []string `json:"SecurityGroupIds"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-cluster-vpcconfig.html#cfn-sagemaker-cluster-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 *Cluster_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Cluster.VpcConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_applifecyclemanagement.go b/cloudformation/sagemaker/aws-sagemaker-domain_applifecyclemanagement.go
new file mode 100644
index 0000000000..32e2ca4507
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_applifecyclemanagement.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Domain_AppLifecycleManagement AWS CloudFormation Resource (AWS::SageMaker::Domain.AppLifecycleManagement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-applifecyclemanagement.html
+type Domain_AppLifecycleManagement struct {
+
+	// IdleSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-applifecyclemanagement.html#cfn-sagemaker-domain-applifecyclemanagement-idlesettings
+	IdleSettings *Domain_IdleSettings `json:"IdleSettings,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 *Domain_AppLifecycleManagement) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.AppLifecycleManagement"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_codeeditorappsettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_codeeditorappsettings.go
index ccbb89f3ce..d83a506457 100644
--- a/cloudformation/sagemaker/aws-sagemaker-domain_codeeditorappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_codeeditorappsettings.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-codeeditorappsettings.html
 type Domain_CodeEditorAppSettings struct {
 
+	// AppLifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-codeeditorappsettings.html#cfn-sagemaker-domain-codeeditorappsettings-applifecyclemanagement
+	AppLifecycleManagement *Domain_AppLifecycleManagement `json:"AppLifecycleManagement,omitempty"`
+
 	// CustomImages AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-codeeditorappsettings.html#cfn-sagemaker-domain-codeeditorappsettings-customimages
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_defaultspacesettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_defaultspacesettings.go
index 65a339075e..ff448ab03d 100644
--- a/cloudformation/sagemaker/aws-sagemaker-domain_defaultspacesettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_defaultspacesettings.go
@@ -10,11 +10,26 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html
 type Domain_DefaultSpaceSettings struct {
 
+	// CustomFileSystemConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html#cfn-sagemaker-domain-defaultspacesettings-customfilesystemconfigs
+	CustomFileSystemConfigs []Domain_CustomFileSystemConfig `json:"CustomFileSystemConfigs,omitempty"`
+
+	// CustomPosixUserConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html#cfn-sagemaker-domain-defaultspacesettings-customposixuserconfig
+	CustomPosixUserConfig *Domain_CustomPosixUserConfig `json:"CustomPosixUserConfig,omitempty"`
+
 	// ExecutionRole AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html#cfn-sagemaker-domain-defaultspacesettings-executionrole
 	ExecutionRole string `json:"ExecutionRole"`
 
+	// JupyterLabAppSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html#cfn-sagemaker-domain-defaultspacesettings-jupyterlabappsettings
+	JupyterLabAppSettings *Domain_JupyterLabAppSettings `json:"JupyterLabAppSettings,omitempty"`
+
 	// JupyterServerAppSettings AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html#cfn-sagemaker-domain-defaultspacesettings-jupyterserverappsettings
@@ -30,6 +45,11 @@ type Domain_DefaultSpaceSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html#cfn-sagemaker-domain-defaultspacesettings-securitygroups
 	SecurityGroups []string `json:"SecurityGroups,omitempty"`
 
+	// SpaceStorageSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-defaultspacesettings.html#cfn-sagemaker-domain-defaultspacesettings-spacestoragesettings
+	SpaceStorageSettings *Domain_DefaultSpaceStorageSettings `json:"SpaceStorageSettings,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_idlesettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_idlesettings.go
new file mode 100644
index 0000000000..267231e837
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_idlesettings.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Domain_IdleSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.IdleSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-idlesettings.html
+type Domain_IdleSettings struct {
+
+	// IdleTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-idlesettings.html#cfn-sagemaker-domain-idlesettings-idletimeoutinminutes
+	IdleTimeoutInMinutes *int `json:"IdleTimeoutInMinutes,omitempty"`
+
+	// LifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-idlesettings.html#cfn-sagemaker-domain-idlesettings-lifecyclemanagement
+	LifecycleManagement *string `json:"LifecycleManagement,omitempty"`
+
+	// MaxIdleTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-idlesettings.html#cfn-sagemaker-domain-idlesettings-maxidletimeoutinminutes
+	MaxIdleTimeoutInMinutes *int `json:"MaxIdleTimeoutInMinutes,omitempty"`
+
+	// MinIdleTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-idlesettings.html#cfn-sagemaker-domain-idlesettings-minidletimeoutinminutes
+	MinIdleTimeoutInMinutes *int `json:"MinIdleTimeoutInMinutes,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 *Domain_IdleSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.IdleSettings"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_jupyterlabappsettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_jupyterlabappsettings.go
index 8386b3c68d..0467327493 100644
--- a/cloudformation/sagemaker/aws-sagemaker-domain_jupyterlabappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_jupyterlabappsettings.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-jupyterlabappsettings.html
 type Domain_JupyterLabAppSettings struct {
 
+	// AppLifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-jupyterlabappsettings.html#cfn-sagemaker-domain-jupyterlabappsettings-applifecyclemanagement
+	AppLifecycleManagement *Domain_AppLifecycleManagement `json:"AppLifecycleManagement,omitempty"`
+
 	// CodeRepositories AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-jupyterlabappsettings.html#cfn-sagemaker-domain-jupyterlabappsettings-coderepositories
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
index c72bc0f2ee..b763f0e8f2 100644
--- a/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
@@ -15,6 +15,11 @@ type Domain_JupyterServerAppSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-jupyterserverappsettings.html#cfn-sagemaker-domain-jupyterserverappsettings-defaultresourcespec
 	DefaultResourceSpec *Domain_ResourceSpec `json:"DefaultResourceSpec,omitempty"`
 
+	// LifecycleConfigArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-jupyterserverappsettings.html#cfn-sagemaker-domain-jupyterserverappsettings-lifecycleconfigarns
+	LifecycleConfigArns []string `json:"LifecycleConfigArns,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
index d117cdc607..b0a1bc5d27 100644
--- a/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
@@ -20,6 +20,11 @@ type Domain_KernelGatewayAppSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-kernelgatewayappsettings.html#cfn-sagemaker-domain-kernelgatewayappsettings-defaultresourcespec
 	DefaultResourceSpec *Domain_ResourceSpec `json:"DefaultResourceSpec,omitempty"`
 
+	// LifecycleConfigArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-kernelgatewayappsettings.html#cfn-sagemaker-domain-kernelgatewayappsettings-lifecycleconfigarns
+	LifecycleConfigArns []string `json:"LifecycleConfigArns,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_studiowebportalsettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_studiowebportalsettings.go
new file mode 100644
index 0000000000..dbe8995418
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_studiowebportalsettings.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Domain_StudioWebPortalSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.StudioWebPortalSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-studiowebportalsettings.html
+type Domain_StudioWebPortalSettings struct {
+
+	// HiddenAppTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-studiowebportalsettings.html#cfn-sagemaker-domain-studiowebportalsettings-hiddenapptypes
+	HiddenAppTypes []string `json:"HiddenAppTypes,omitempty"`
+
+	// HiddenMlTools AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-studiowebportalsettings.html#cfn-sagemaker-domain-studiowebportalsettings-hiddenmltools
+	HiddenMlTools []string `json:"HiddenMlTools,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 *Domain_StudioWebPortalSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.StudioWebPortalSettings"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go b/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
index 026f706cb6..c240ea8893 100644
--- a/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
@@ -80,6 +80,11 @@ type Domain_UserSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html#cfn-sagemaker-domain-usersettings-studiowebportal
 	StudioWebPortal *string `json:"StudioWebPortal,omitempty"`
 
+	// StudioWebPortalSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html#cfn-sagemaker-domain-usersettings-studiowebportalsettings
+	StudioWebPortalSettings *Domain_StudioWebPortalSettings `json:"StudioWebPortalSettings,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-imageversion.go b/cloudformation/sagemaker/aws-sagemaker-imageversion.go
index 536059d804..2ecdc0bc13 100644
--- a/cloudformation/sagemaker/aws-sagemaker-imageversion.go
+++ b/cloudformation/sagemaker/aws-sagemaker-imageversion.go
@@ -68,6 +68,11 @@ type ImageVersion struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-imageversion.html#cfn-sagemaker-imageversion-vendorguidance
 	VendorGuidance *string `json:"VendorGuidance,omitempty"`
 
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-imageversion.html#cfn-sagemaker-imageversion-version
+	Version *int `json:"Version,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-mlflowtrackingserver.go b/cloudformation/sagemaker/aws-sagemaker-mlflowtrackingserver.go
new file mode 100644
index 0000000000..24a0e4d4db
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-mlflowtrackingserver.go
@@ -0,0 +1,153 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MlflowTrackingServer AWS CloudFormation Resource (AWS::SageMaker::MlflowTrackingServer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html
+type MlflowTrackingServer struct {
+
+	// ArtifactStoreUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-artifactstoreuri
+	ArtifactStoreUri string `json:"ArtifactStoreUri"`
+
+	// AutomaticModelRegistration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-automaticmodelregistration
+	AutomaticModelRegistration *bool `json:"AutomaticModelRegistration,omitempty"`
+
+	// MlflowVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-mlflowversion
+	MlflowVersion *string `json:"MlflowVersion,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// TrackingServerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-trackingservername
+	TrackingServerName string `json:"TrackingServerName"`
+
+	// TrackingServerSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-trackingserversize
+	TrackingServerSize *string `json:"TrackingServerSize,omitempty"`
+
+	// WeeklyMaintenanceWindowStart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-mlflowtrackingserver.html#cfn-sagemaker-mlflowtrackingserver-weeklymaintenancewindowstart
+	WeeklyMaintenanceWindowStart *string `json:"WeeklyMaintenanceWindowStart,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 *MlflowTrackingServer) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MlflowTrackingServer"
+}
+
+// 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 MlflowTrackingServer) MarshalJSON() ([]byte, error) {
+	type Properties MlflowTrackingServer
+	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 *MlflowTrackingServer) UnmarshalJSON(b []byte) error {
+	type Properties MlflowTrackingServer
+	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 = MlflowTrackingServer(*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/sagemaker/aws-sagemaker-model_additionalmodeldatasource.go b/cloudformation/sagemaker/aws-sagemaker-model_additionalmodeldatasource.go
new file mode 100644
index 0000000000..41c7708ea3
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-model_additionalmodeldatasource.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Model_AdditionalModelDataSource AWS CloudFormation Resource (AWS::SageMaker::Model.AdditionalModelDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-additionalmodeldatasource.html
+type Model_AdditionalModelDataSource struct {
+
+	// ChannelName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-additionalmodeldatasource.html#cfn-sagemaker-model-additionalmodeldatasource-channelname
+	ChannelName string `json:"ChannelName"`
+
+	// S3DataSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-additionalmodeldatasource.html#cfn-sagemaker-model-additionalmodeldatasource-s3datasource
+	S3DataSource *Model_S3DataSource `json:"S3DataSource"`
+
+	// 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 *Model_AdditionalModelDataSource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.AdditionalModelDataSource"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-model_hubaccessconfig.go b/cloudformation/sagemaker/aws-sagemaker-model_hubaccessconfig.go
new file mode 100644
index 0000000000..af4630aafc
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-model_hubaccessconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Model_HubAccessConfig AWS CloudFormation Resource (AWS::SageMaker::Model.HubAccessConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource-hubaccessconfig.html
+type Model_HubAccessConfig struct {
+
+	// HubContentArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource-hubaccessconfig.html#cfn-sagemaker-model-s3datasource-hubaccessconfig-hubcontentarn
+	HubContentArn string `json:"HubContentArn"`
+
+	// 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 *Model_HubAccessConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.HubAccessConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-model_modelaccessconfig.go b/cloudformation/sagemaker/aws-sagemaker-model_modelaccessconfig.go
index 6daaeb9479..7cccd7e4cf 100644
--- a/cloudformation/sagemaker/aws-sagemaker-model_modelaccessconfig.go
+++ b/cloudformation/sagemaker/aws-sagemaker-model_modelaccessconfig.go
@@ -7,12 +7,12 @@ import (
 )
 
 // Model_ModelAccessConfig AWS CloudFormation Resource (AWS::SageMaker::Model.ModelAccessConfig)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-modeldatasource-s3datasource-modelaccessconfig.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource-modelaccessconfig.html
 type Model_ModelAccessConfig struct {
 
 	// AcceptEula AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-modeldatasource-s3datasource-modelaccessconfig.html#cfn-sagemaker-model-containerdefinition-modeldatasource-s3datasource-modelaccessconfig-accepteula
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource-modelaccessconfig.html#cfn-sagemaker-model-s3datasource-modelaccessconfig-accepteula
 	AcceptEula bool `json:"AcceptEula"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/sagemaker/aws-sagemaker-model_s3datasource.go b/cloudformation/sagemaker/aws-sagemaker-model_s3datasource.go
index 910e3863a9..45886ffd3d 100644
--- a/cloudformation/sagemaker/aws-sagemaker-model_s3datasource.go
+++ b/cloudformation/sagemaker/aws-sagemaker-model_s3datasource.go
@@ -7,27 +7,32 @@ import (
 )
 
 // Model_S3DataSource AWS CloudFormation Resource (AWS::SageMaker::Model.S3DataSource)
-// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-modeldatasource-s3datasource.html
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource.html
 type Model_S3DataSource struct {
 
 	// CompressionType AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-modeldatasource-s3datasource.html#cfn-sagemaker-model-containerdefinition-modeldatasource-s3datasource-compressiontype
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource.html#cfn-sagemaker-model-s3datasource-compressiontype
 	CompressionType string `json:"CompressionType"`
 
+	// HubAccessConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource.html#cfn-sagemaker-model-s3datasource-hubaccessconfig
+	HubAccessConfig *Model_HubAccessConfig `json:"HubAccessConfig,omitempty"`
+
 	// ModelAccessConfig AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-modeldatasource-s3datasource.html#cfn-sagemaker-model-containerdefinition-modeldatasource-s3datasource-modelaccessconfig
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource.html#cfn-sagemaker-model-s3datasource-modelaccessconfig
 	ModelAccessConfig *Model_ModelAccessConfig `json:"ModelAccessConfig,omitempty"`
 
 	// S3DataType AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-modeldatasource-s3datasource.html#cfn-sagemaker-model-containerdefinition-modeldatasource-s3datasource-s3datatype
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource.html#cfn-sagemaker-model-s3datasource-s3datatype
 	S3DataType string `json:"S3DataType"`
 
 	// S3Uri AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-modeldatasource-s3datasource.html#cfn-sagemaker-model-containerdefinition-modeldatasource-s3datasource-s3uri
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-s3datasource.html#cfn-sagemaker-model-s3datasource-s3uri
 	S3Uri string `json:"S3Uri"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage.go
index a15ac03c92..44091705b8 100644
--- a/cloudformation/sagemaker/aws-sagemaker-modelpackage.go
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage.go
@@ -74,6 +74,11 @@ type ModelPackage struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-modelapprovalstatus
 	ModelApprovalStatus *string `json:"ModelApprovalStatus,omitempty"`
 
+	// ModelCard AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-modelcard
+	ModelCard *ModelPackage_ModelCard `json:"ModelCard,omitempty"`
+
 	// ModelMetrics AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-modelmetrics
@@ -109,6 +114,11 @@ type ModelPackage struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-samplepayloadurl
 	SamplePayloadUrl *string `json:"SamplePayloadUrl,omitempty"`
 
+	// SecurityConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-securityconfig
+	SecurityConfig *ModelPackage_SecurityConfig `json:"SecurityConfig,omitempty"`
+
 	// SkipModelValidation AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-skipmodelvalidation
@@ -119,6 +129,11 @@ type ModelPackage struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-sourcealgorithmspecification
 	SourceAlgorithmSpecification *ModelPackage_SourceAlgorithmSpecification `json:"SourceAlgorithmSpecification,omitempty"`
 
+	// SourceUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-sourceuri
+	SourceUri *string `json:"SourceUri,omitempty"`
+
 	// Tags AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackage.html#cfn-sagemaker-modelpackage-tags
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelaccessconfig.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelaccessconfig.go
new file mode 100644
index 0000000000..7bba56ac55
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelaccessconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ModelPackage_ModelAccessConfig AWS CloudFormation Resource (AWS::SageMaker::ModelPackage.ModelAccessConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelaccessconfig.html
+type ModelPackage_ModelAccessConfig struct {
+
+	// AcceptEula AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelaccessconfig.html#cfn-sagemaker-modelpackage-modelaccessconfig-accepteula
+	AcceptEula bool `json:"AcceptEula"`
+
+	// 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 *ModelPackage_ModelAccessConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelPackage.ModelAccessConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelcard.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelcard.go
new file mode 100644
index 0000000000..b57fc4478c
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelcard.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ModelPackage_ModelCard AWS CloudFormation Resource (AWS::SageMaker::ModelPackage.ModelCard)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelcard.html
+type ModelPackage_ModelCard struct {
+
+	// ModelCardContent AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelcard.html#cfn-sagemaker-modelpackage-modelcard-modelcardcontent
+	ModelCardContent string `json:"ModelCardContent"`
+
+	// ModelCardStatus AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelcard.html#cfn-sagemaker-modelpackage-modelcard-modelcardstatus
+	ModelCardStatus string `json:"ModelCardStatus"`
+
+	// 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 *ModelPackage_ModelCard) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelPackage.ModelCard"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modeldatasource.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modeldatasource.go
new file mode 100644
index 0000000000..f3c8965a10
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modeldatasource.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ModelPackage_ModelDataSource AWS CloudFormation Resource (AWS::SageMaker::ModelPackage.ModelDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modeldatasource.html
+type ModelPackage_ModelDataSource struct {
+
+	// S3DataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modeldatasource.html#cfn-sagemaker-modelpackage-modeldatasource-s3datasource
+	S3DataSource *ModelPackage_S3ModelDataSource `json:"S3DataSource,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 *ModelPackage_ModelDataSource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelPackage.ModelDataSource"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go
index 9362582cdf..82abbd1fec 100644
--- a/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_modelpackagecontainerdefinition.go
@@ -40,6 +40,11 @@ type ModelPackage_ModelPackageContainerDefinition struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagecontainerdefinition.html#cfn-sagemaker-modelpackage-modelpackagecontainerdefinition-imagedigest
 	ImageDigest *string `json:"ImageDigest,omitempty"`
 
+	// ModelDataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagecontainerdefinition.html#cfn-sagemaker-modelpackage-modelpackagecontainerdefinition-modeldatasource
+	ModelDataSource *ModelPackage_ModelDataSource `json:"ModelDataSource,omitempty"`
+
 	// ModelDataUrl AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-modelpackagecontainerdefinition.html#cfn-sagemaker-modelpackage-modelpackagecontainerdefinition-modeldataurl
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_s3modeldatasource.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_s3modeldatasource.go
new file mode 100644
index 0000000000..50eeb9253c
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_s3modeldatasource.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ModelPackage_S3ModelDataSource AWS CloudFormation Resource (AWS::SageMaker::ModelPackage.S3ModelDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-s3modeldatasource.html
+type ModelPackage_S3ModelDataSource struct {
+
+	// CompressionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-s3modeldatasource.html#cfn-sagemaker-modelpackage-s3modeldatasource-compressiontype
+	CompressionType string `json:"CompressionType"`
+
+	// ModelAccessConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-s3modeldatasource.html#cfn-sagemaker-modelpackage-s3modeldatasource-modelaccessconfig
+	ModelAccessConfig *ModelPackage_ModelAccessConfig `json:"ModelAccessConfig,omitempty"`
+
+	// S3DataType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-s3modeldatasource.html#cfn-sagemaker-modelpackage-s3modeldatasource-s3datatype
+	S3DataType string `json:"S3DataType"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-s3modeldatasource.html#cfn-sagemaker-modelpackage-s3modeldatasource-s3uri
+	S3Uri string `json:"S3Uri"`
+
+	// 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 *ModelPackage_S3ModelDataSource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelPackage.S3ModelDataSource"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-modelpackage_securityconfig.go b/cloudformation/sagemaker/aws-sagemaker-modelpackage_securityconfig.go
new file mode 100644
index 0000000000..c29894bbd6
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-modelpackage_securityconfig.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ModelPackage_SecurityConfig AWS CloudFormation Resource (AWS::SageMaker::ModelPackage.SecurityConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-securityconfig.html
+type ModelPackage_SecurityConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelpackage-securityconfig.html#cfn-sagemaker-modelpackage-securityconfig-kmskeyid
+	KmsKeyId string `json:"KmsKeyId"`
+
+	// 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 *ModelPackage_SecurityConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelPackage.SecurityConfig"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-space_jupyterserverappsettings.go b/cloudformation/sagemaker/aws-sagemaker-space_jupyterserverappsettings.go
index 9ae8e361f9..f232d9a06c 100644
--- a/cloudformation/sagemaker/aws-sagemaker-space_jupyterserverappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-space_jupyterserverappsettings.go
@@ -15,6 +15,11 @@ type Space_JupyterServerAppSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-jupyterserverappsettings.html#cfn-sagemaker-space-jupyterserverappsettings-defaultresourcespec
 	DefaultResourceSpec *Space_ResourceSpec `json:"DefaultResourceSpec,omitempty"`
 
+	// LifecycleConfigArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-jupyterserverappsettings.html#cfn-sagemaker-space-jupyterserverappsettings-lifecycleconfigarns
+	LifecycleConfigArns []string `json:"LifecycleConfigArns,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-space_kernelgatewayappsettings.go b/cloudformation/sagemaker/aws-sagemaker-space_kernelgatewayappsettings.go
index 7ee9005394..e0a2a21af7 100644
--- a/cloudformation/sagemaker/aws-sagemaker-space_kernelgatewayappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-space_kernelgatewayappsettings.go
@@ -20,6 +20,11 @@ type Space_KernelGatewayAppSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-kernelgatewayappsettings.html#cfn-sagemaker-space-kernelgatewayappsettings-defaultresourcespec
 	DefaultResourceSpec *Space_ResourceSpec `json:"DefaultResourceSpec,omitempty"`
 
+	// LifecycleConfigArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-kernelgatewayappsettings.html#cfn-sagemaker-space-kernelgatewayappsettings-lifecycleconfigarns
+	LifecycleConfigArns []string `json:"LifecycleConfigArns,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-space_resourcespec.go b/cloudformation/sagemaker/aws-sagemaker-space_resourcespec.go
index 9f4e668423..8cefef5939 100644
--- a/cloudformation/sagemaker/aws-sagemaker-space_resourcespec.go
+++ b/cloudformation/sagemaker/aws-sagemaker-space_resourcespec.go
@@ -15,6 +15,11 @@ type Space_ResourceSpec struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-resourcespec.html#cfn-sagemaker-space-resourcespec-instancetype
 	InstanceType *string `json:"InstanceType,omitempty"`
 
+	// LifecycleConfigArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-resourcespec.html#cfn-sagemaker-space-resourcespec-lifecycleconfigarn
+	LifecycleConfigArn *string `json:"LifecycleConfigArn,omitempty"`
+
 	// SageMakerImageArn AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-resourcespec.html#cfn-sagemaker-space-resourcespec-sagemakerimagearn
diff --git a/cloudformation/sagemaker/aws-sagemaker-space_spaceapplifecyclemanagement.go b/cloudformation/sagemaker/aws-sagemaker-space_spaceapplifecyclemanagement.go
new file mode 100644
index 0000000000..cb7503b3fb
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-space_spaceapplifecyclemanagement.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Space_SpaceAppLifecycleManagement AWS CloudFormation Resource (AWS::SageMaker::Space.SpaceAppLifecycleManagement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spaceapplifecyclemanagement.html
+type Space_SpaceAppLifecycleManagement struct {
+
+	// IdleSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spaceapplifecyclemanagement.html#cfn-sagemaker-space-spaceapplifecyclemanagement-idlesettings
+	IdleSettings *Space_SpaceIdleSettings `json:"IdleSettings,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 *Space_SpaceAppLifecycleManagement) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-space_spacecodeeditorappsettings.go b/cloudformation/sagemaker/aws-sagemaker-space_spacecodeeditorappsettings.go
index 014f402150..ef5d3965dd 100644
--- a/cloudformation/sagemaker/aws-sagemaker-space_spacecodeeditorappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-space_spacecodeeditorappsettings.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacecodeeditorappsettings.html
 type Space_SpaceCodeEditorAppSettings struct {
 
+	// AppLifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacecodeeditorappsettings.html#cfn-sagemaker-space-spacecodeeditorappsettings-applifecyclemanagement
+	AppLifecycleManagement *Space_SpaceAppLifecycleManagement `json:"AppLifecycleManagement,omitempty"`
+
 	// DefaultResourceSpec AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacecodeeditorappsettings.html#cfn-sagemaker-space-spacecodeeditorappsettings-defaultresourcespec
diff --git a/cloudformation/sagemaker/aws-sagemaker-space_spaceidlesettings.go b/cloudformation/sagemaker/aws-sagemaker-space_spaceidlesettings.go
new file mode 100644
index 0000000000..2dff21b8e8
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-space_spaceidlesettings.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Space_SpaceIdleSettings AWS CloudFormation Resource (AWS::SageMaker::Space.SpaceIdleSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spaceidlesettings.html
+type Space_SpaceIdleSettings struct {
+
+	// IdleTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spaceidlesettings.html#cfn-sagemaker-space-spaceidlesettings-idletimeoutinminutes
+	IdleTimeoutInMinutes *int `json:"IdleTimeoutInMinutes,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 *Space_SpaceIdleSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Space.SpaceIdleSettings"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-space_spacejupyterlabappsettings.go b/cloudformation/sagemaker/aws-sagemaker-space_spacejupyterlabappsettings.go
index 1ab8add6a0..e36271c765 100644
--- a/cloudformation/sagemaker/aws-sagemaker-space_spacejupyterlabappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-space_spacejupyterlabappsettings.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacejupyterlabappsettings.html
 type Space_SpaceJupyterLabAppSettings struct {
 
+	// AppLifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacejupyterlabappsettings.html#cfn-sagemaker-space-spacejupyterlabappsettings-applifecyclemanagement
+	AppLifecycleManagement *Space_SpaceAppLifecycleManagement `json:"AppLifecycleManagement,omitempty"`
+
 	// CodeRepositories AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-space-spacejupyterlabappsettings.html#cfn-sagemaker-space-spacejupyterlabappsettings-coderepositories
diff --git a/cloudformation/sagemaker/aws-sagemaker-studiolifecycleconfig.go b/cloudformation/sagemaker/aws-sagemaker-studiolifecycleconfig.go
new file mode 100644
index 0000000000..db910c8716
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-studiolifecycleconfig.go
@@ -0,0 +1,133 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// StudioLifecycleConfig AWS CloudFormation Resource (AWS::SageMaker::StudioLifecycleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-studiolifecycleconfig.html
+type StudioLifecycleConfig struct {
+
+	// StudioLifecycleConfigAppType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-studiolifecycleconfig.html#cfn-sagemaker-studiolifecycleconfig-studiolifecycleconfigapptype
+	StudioLifecycleConfigAppType string `json:"StudioLifecycleConfigAppType"`
+
+	// StudioLifecycleConfigContent AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-studiolifecycleconfig.html#cfn-sagemaker-studiolifecycleconfig-studiolifecycleconfigcontent
+	StudioLifecycleConfigContent string `json:"StudioLifecycleConfigContent"`
+
+	// StudioLifecycleConfigName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-studiolifecycleconfig.html#cfn-sagemaker-studiolifecycleconfig-studiolifecycleconfigname
+	StudioLifecycleConfigName string `json:"StudioLifecycleConfigName"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-studiolifecycleconfig.html#cfn-sagemaker-studiolifecycleconfig-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 *StudioLifecycleConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::StudioLifecycleConfig"
+}
+
+// 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 StudioLifecycleConfig) MarshalJSON() ([]byte, error) {
+	type Properties StudioLifecycleConfig
+	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 *StudioLifecycleConfig) UnmarshalJSON(b []byte) error {
+	type Properties StudioLifecycleConfig
+	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 = StudioLifecycleConfig(*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/sagemaker/aws-sagemaker-userprofile_applifecyclemanagement.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_applifecyclemanagement.go
new file mode 100644
index 0000000000..6c26185978
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_applifecyclemanagement.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserProfile_AppLifecycleManagement AWS CloudFormation Resource (AWS::SageMaker::UserProfile.AppLifecycleManagement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-applifecyclemanagement.html
+type UserProfile_AppLifecycleManagement struct {
+
+	// IdleSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-applifecyclemanagement.html#cfn-sagemaker-userprofile-applifecyclemanagement-idlesettings
+	IdleSettings *UserProfile_IdleSettings `json:"IdleSettings,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 *UserProfile_AppLifecycleManagement) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.AppLifecycleManagement"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_codeeditorappsettings.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_codeeditorappsettings.go
index fcd8d8895f..dd41c273c6 100644
--- a/cloudformation/sagemaker/aws-sagemaker-userprofile_codeeditorappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_codeeditorappsettings.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-codeeditorappsettings.html
 type UserProfile_CodeEditorAppSettings struct {
 
+	// AppLifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-codeeditorappsettings.html#cfn-sagemaker-userprofile-codeeditorappsettings-applifecyclemanagement
+	AppLifecycleManagement *UserProfile_AppLifecycleManagement `json:"AppLifecycleManagement,omitempty"`
+
 	// CustomImages AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-codeeditorappsettings.html#cfn-sagemaker-userprofile-codeeditorappsettings-customimages
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_idlesettings.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_idlesettings.go
new file mode 100644
index 0000000000..6bf1c13b16
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_idlesettings.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserProfile_IdleSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.IdleSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-idlesettings.html
+type UserProfile_IdleSettings struct {
+
+	// IdleTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-idlesettings.html#cfn-sagemaker-userprofile-idlesettings-idletimeoutinminutes
+	IdleTimeoutInMinutes *int `json:"IdleTimeoutInMinutes,omitempty"`
+
+	// LifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-idlesettings.html#cfn-sagemaker-userprofile-idlesettings-lifecyclemanagement
+	LifecycleManagement *string `json:"LifecycleManagement,omitempty"`
+
+	// MaxIdleTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-idlesettings.html#cfn-sagemaker-userprofile-idlesettings-maxidletimeoutinminutes
+	MaxIdleTimeoutInMinutes *int `json:"MaxIdleTimeoutInMinutes,omitempty"`
+
+	// MinIdleTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-idlesettings.html#cfn-sagemaker-userprofile-idlesettings-minidletimeoutinminutes
+	MinIdleTimeoutInMinutes *int `json:"MinIdleTimeoutInMinutes,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 *UserProfile_IdleSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.IdleSettings"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterlabappsettings.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterlabappsettings.go
index ca78e61ac5..efd37bd731 100644
--- a/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterlabappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterlabappsettings.go
@@ -10,6 +10,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-jupyterlabappsettings.html
 type UserProfile_JupyterLabAppSettings struct {
 
+	// AppLifecycleManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-jupyterlabappsettings.html#cfn-sagemaker-userprofile-jupyterlabappsettings-applifecyclemanagement
+	AppLifecycleManagement *UserProfile_AppLifecycleManagement `json:"AppLifecycleManagement,omitempty"`
+
 	// CodeRepositories AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-jupyterlabappsettings.html#cfn-sagemaker-userprofile-jupyterlabappsettings-coderepositories
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
index 6734fe2fe9..9604bbc5b5 100644
--- a/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
@@ -15,6 +15,11 @@ type UserProfile_JupyterServerAppSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-jupyterserverappsettings.html#cfn-sagemaker-userprofile-jupyterserverappsettings-defaultresourcespec
 	DefaultResourceSpec *UserProfile_ResourceSpec `json:"DefaultResourceSpec,omitempty"`
 
+	// LifecycleConfigArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-jupyterserverappsettings.html#cfn-sagemaker-userprofile-jupyterserverappsettings-lifecycleconfigarns
+	LifecycleConfigArns []string `json:"LifecycleConfigArns,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
index 964f660121..fe38ea967b 100644
--- a/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
@@ -20,6 +20,11 @@ type UserProfile_KernelGatewayAppSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-kernelgatewayappsettings.html#cfn-sagemaker-userprofile-kernelgatewayappsettings-defaultresourcespec
 	DefaultResourceSpec *UserProfile_ResourceSpec `json:"DefaultResourceSpec,omitempty"`
 
+	// LifecycleConfigArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-kernelgatewayappsettings.html#cfn-sagemaker-userprofile-kernelgatewayappsettings-lifecycleconfigarns
+	LifecycleConfigArns []string `json:"LifecycleConfigArns,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
index 95749c89dc..0640cd1d40 100644
--- a/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
@@ -15,6 +15,11 @@ type UserProfile_ResourceSpec struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-resourcespec.html#cfn-sagemaker-userprofile-resourcespec-instancetype
 	InstanceType *string `json:"InstanceType,omitempty"`
 
+	// LifecycleConfigArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-resourcespec.html#cfn-sagemaker-userprofile-resourcespec-lifecycleconfigarn
+	LifecycleConfigArn *string `json:"LifecycleConfigArn,omitempty"`
+
 	// SageMakerImageArn AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-resourcespec.html#cfn-sagemaker-userprofile-resourcespec-sagemakerimagearn
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_studiowebportalsettings.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_studiowebportalsettings.go
new file mode 100644
index 0000000000..959a3fb29c
--- /dev/null
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_studiowebportalsettings.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sagemaker
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// UserProfile_StudioWebPortalSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.StudioWebPortalSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-studiowebportalsettings.html
+type UserProfile_StudioWebPortalSettings struct {
+
+	// HiddenAppTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-studiowebportalsettings.html#cfn-sagemaker-userprofile-studiowebportalsettings-hiddenapptypes
+	HiddenAppTypes []string `json:"HiddenAppTypes,omitempty"`
+
+	// HiddenMlTools AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-studiowebportalsettings.html#cfn-sagemaker-userprofile-studiowebportalsettings-hiddenmltools
+	HiddenMlTools []string `json:"HiddenMlTools,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 *UserProfile_StudioWebPortalSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.StudioWebPortalSettings"
+}
diff --git a/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go b/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
index 8f7ffae457..7feb566e38 100644
--- a/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
+++ b/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
@@ -75,6 +75,11 @@ type UserProfile_UserSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html#cfn-sagemaker-userprofile-usersettings-studiowebportal
 	StudioWebPortal *string `json:"StudioWebPortal,omitempty"`
 
+	// StudioWebPortalSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html#cfn-sagemaker-userprofile-usersettings-studiowebportalsettings
+	StudioWebPortalSettings *UserProfile_StudioWebPortalSettings `json:"StudioWebPortalSettings,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/securityhub/aws-securityhub-automationrule.go b/cloudformation/securityhub/aws-securityhub-automationrule.go
index 8e3dda42df..ab80bfe70b 100644
--- a/cloudformation/securityhub/aws-securityhub-automationrule.go
+++ b/cloudformation/securityhub/aws-securityhub-automationrule.go
@@ -14,19 +14,19 @@ import (
 type AutomationRule struct {
 
 	// Actions AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-automationrule.html#cfn-securityhub-automationrule-actions
-	Actions []AutomationRule_AutomationRulesAction `json:"Actions,omitempty"`
+	Actions []AutomationRule_AutomationRulesAction `json:"Actions"`
 
 	// Criteria AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-automationrule.html#cfn-securityhub-automationrule-criteria
-	Criteria *AutomationRule_AutomationRulesFindingFilters `json:"Criteria,omitempty"`
+	Criteria *AutomationRule_AutomationRulesFindingFilters `json:"Criteria"`
 
 	// Description AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-automationrule.html#cfn-securityhub-automationrule-description
-	Description *string `json:"Description,omitempty"`
+	Description string `json:"Description"`
 
 	// IsTerminal AWS CloudFormation Property
 	// Required: false
@@ -34,14 +34,14 @@ type AutomationRule struct {
 	IsTerminal *bool `json:"IsTerminal,omitempty"`
 
 	// RuleName AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-automationrule.html#cfn-securityhub-automationrule-rulename
-	RuleName *string `json:"RuleName,omitempty"`
+	RuleName string `json:"RuleName"`
 
 	// RuleOrder AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-automationrule.html#cfn-securityhub-automationrule-ruleorder
-	RuleOrder *int `json:"RuleOrder,omitempty"`
+	RuleOrder int `json:"RuleOrder"`
 
 	// RuleStatus AWS CloudFormation Property
 	// Required: false
diff --git a/cloudformation/securityhub/aws-securityhub-configurationpolicy.go b/cloudformation/securityhub/aws-securityhub-configurationpolicy.go
new file mode 100644
index 0000000000..855ea8e76a
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-configurationpolicy.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationPolicy AWS CloudFormation Resource (AWS::SecurityHub::ConfigurationPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-configurationpolicy.html
+type ConfigurationPolicy struct {
+
+	// ConfigurationPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-configurationpolicy.html#cfn-securityhub-configurationpolicy-configurationpolicy
+	ConfigurationPolicy *ConfigurationPolicy_Policy `json:"ConfigurationPolicy"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-configurationpolicy.html#cfn-securityhub-configurationpolicy-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-configurationpolicy.html#cfn-securityhub-configurationpolicy-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-configurationpolicy.html#cfn-securityhub-configurationpolicy-tags
+	Tags map[string]string `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 *ConfigurationPolicy) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::ConfigurationPolicy"
+}
+
+// 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 ConfigurationPolicy) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationPolicy
+	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 *ConfigurationPolicy) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationPolicy
+	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 = ConfigurationPolicy(*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/securityhub/aws-securityhub-configurationpolicy_parameterconfiguration.go b/cloudformation/securityhub/aws-securityhub-configurationpolicy_parameterconfiguration.go
new file mode 100644
index 0000000000..f3092347bd
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-configurationpolicy_parameterconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationPolicy_ParameterConfiguration AWS CloudFormation Resource (AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parameterconfiguration.html
+type ConfigurationPolicy_ParameterConfiguration struct {
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parameterconfiguration.html#cfn-securityhub-configurationpolicy-parameterconfiguration-value
+	Value *ConfigurationPolicy_ParameterValue `json:"Value,omitempty"`
+
+	// ValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parameterconfiguration.html#cfn-securityhub-configurationpolicy-parameterconfiguration-valuetype
+	ValueType string `json:"ValueType"`
+
+	// 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 *ConfigurationPolicy_ParameterConfiguration) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration"
+}
diff --git a/cloudformation/securityhub/aws-securityhub-configurationpolicy_parametervalue.go b/cloudformation/securityhub/aws-securityhub-configurationpolicy_parametervalue.go
new file mode 100644
index 0000000000..c5d7fd8bdc
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-configurationpolicy_parametervalue.go
@@ -0,0 +1,72 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationPolicy_ParameterValue AWS CloudFormation Resource (AWS::SecurityHub::ConfigurationPolicy.ParameterValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html
+type ConfigurationPolicy_ParameterValue struct {
+
+	// Boolean AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-boolean
+	Boolean *bool `json:"Boolean,omitempty"`
+
+	// Double AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-double
+	Double *float64 `json:"Double,omitempty"`
+
+	// Enum AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-enum
+	Enum *string `json:"Enum,omitempty"`
+
+	// EnumList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-enumlist
+	EnumList []string `json:"EnumList,omitempty"`
+
+	// Integer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-integer
+	Integer *int `json:"Integer,omitempty"`
+
+	// IntegerList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-integerlist
+	IntegerList []int `json:"IntegerList,omitempty"`
+
+	// String AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-string
+	String *string `json:"String,omitempty"`
+
+	// StringList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-parametervalue.html#cfn-securityhub-configurationpolicy-parametervalue-stringlist
+	StringList []string `json:"StringList,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 *ConfigurationPolicy_ParameterValue) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::ConfigurationPolicy.ParameterValue"
+}
diff --git a/cloudformation/securityhub/aws-securityhub-configurationpolicy_policy.go b/cloudformation/securityhub/aws-securityhub-configurationpolicy_policy.go
new file mode 100644
index 0000000000..ba413582df
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-configurationpolicy_policy.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationPolicy_Policy AWS CloudFormation Resource (AWS::SecurityHub::ConfigurationPolicy.Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-policy.html
+type ConfigurationPolicy_Policy struct {
+
+	// SecurityHub AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-policy.html#cfn-securityhub-configurationpolicy-policy-securityhub
+	SecurityHub *ConfigurationPolicy_SecurityHubPolicy `json:"SecurityHub,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 *ConfigurationPolicy_Policy) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::ConfigurationPolicy.Policy"
+}
diff --git a/cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolcustomparameter.go b/cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolcustomparameter.go
new file mode 100644
index 0000000000..4e019083e1
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolcustomparameter.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationPolicy_SecurityControlCustomParameter AWS CloudFormation Resource (AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securitycontrolcustomparameter.html
+type ConfigurationPolicy_SecurityControlCustomParameter struct {
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securitycontrolcustomparameter.html#cfn-securityhub-configurationpolicy-securitycontrolcustomparameter-parameters
+	Parameters map[string]ConfigurationPolicy_ParameterConfiguration `json:"Parameters,omitempty"`
+
+	// SecurityControlId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securitycontrolcustomparameter.html#cfn-securityhub-configurationpolicy-securitycontrolcustomparameter-securitycontrolid
+	SecurityControlId *string `json:"SecurityControlId,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 *ConfigurationPolicy_SecurityControlCustomParameter) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter"
+}
diff --git a/cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolsconfiguration.go b/cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolsconfiguration.go
new file mode 100644
index 0000000000..afe45bd8b7
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-configurationpolicy_securitycontrolsconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationPolicy_SecurityControlsConfiguration AWS CloudFormation Resource (AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securitycontrolsconfiguration.html
+type ConfigurationPolicy_SecurityControlsConfiguration struct {
+
+	// DisabledSecurityControlIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securitycontrolsconfiguration.html#cfn-securityhub-configurationpolicy-securitycontrolsconfiguration-disabledsecuritycontrolidentifiers
+	DisabledSecurityControlIdentifiers []string `json:"DisabledSecurityControlIdentifiers,omitempty"`
+
+	// EnabledSecurityControlIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securitycontrolsconfiguration.html#cfn-securityhub-configurationpolicy-securitycontrolsconfiguration-enabledsecuritycontrolidentifiers
+	EnabledSecurityControlIdentifiers []string `json:"EnabledSecurityControlIdentifiers,omitempty"`
+
+	// SecurityControlCustomParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securitycontrolsconfiguration.html#cfn-securityhub-configurationpolicy-securitycontrolsconfiguration-securitycontrolcustomparameters
+	SecurityControlCustomParameters []ConfigurationPolicy_SecurityControlCustomParameter `json:"SecurityControlCustomParameters,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 *ConfigurationPolicy_SecurityControlsConfiguration) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration"
+}
diff --git a/cloudformation/securityhub/aws-securityhub-configurationpolicy_securityhubpolicy.go b/cloudformation/securityhub/aws-securityhub-configurationpolicy_securityhubpolicy.go
new file mode 100644
index 0000000000..cc961f0566
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-configurationpolicy_securityhubpolicy.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationPolicy_SecurityHubPolicy AWS CloudFormation Resource (AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securityhubpolicy.html
+type ConfigurationPolicy_SecurityHubPolicy struct {
+
+	// EnabledStandardIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securityhubpolicy.html#cfn-securityhub-configurationpolicy-securityhubpolicy-enabledstandardidentifiers
+	EnabledStandardIdentifiers []string `json:"EnabledStandardIdentifiers,omitempty"`
+
+	// SecurityControlsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securityhubpolicy.html#cfn-securityhub-configurationpolicy-securityhubpolicy-securitycontrolsconfiguration
+	SecurityControlsConfiguration *ConfigurationPolicy_SecurityControlsConfiguration `json:"SecurityControlsConfiguration,omitempty"`
+
+	// ServiceEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-configurationpolicy-securityhubpolicy.html#cfn-securityhub-configurationpolicy-securityhubpolicy-serviceenabled
+	ServiceEnabled *bool `json:"ServiceEnabled,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 *ConfigurationPolicy_SecurityHubPolicy) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy"
+}
diff --git a/cloudformation/securityhub/aws-securityhub-findingaggregator.go b/cloudformation/securityhub/aws-securityhub-findingaggregator.go
new file mode 100644
index 0000000000..e7e2e9d8a0
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-findingaggregator.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// FindingAggregator AWS CloudFormation Resource (AWS::SecurityHub::FindingAggregator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-findingaggregator.html
+type FindingAggregator struct {
+
+	// RegionLinkingMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-findingaggregator.html#cfn-securityhub-findingaggregator-regionlinkingmode
+	RegionLinkingMode string `json:"RegionLinkingMode"`
+
+	// Regions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-findingaggregator.html#cfn-securityhub-findingaggregator-regions
+	Regions []string `json:"Regions,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 *FindingAggregator) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::FindingAggregator"
+}
+
+// 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 FindingAggregator) MarshalJSON() ([]byte, error) {
+	type Properties FindingAggregator
+	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 *FindingAggregator) UnmarshalJSON(b []byte) error {
+	type Properties FindingAggregator
+	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 = FindingAggregator(*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/securityhub/aws-securityhub-organizationconfiguration.go b/cloudformation/securityhub/aws-securityhub-organizationconfiguration.go
new file mode 100644
index 0000000000..959a5c08b5
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-organizationconfiguration.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// OrganizationConfiguration AWS CloudFormation Resource (AWS::SecurityHub::OrganizationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-organizationconfiguration.html
+type OrganizationConfiguration struct {
+
+	// AutoEnable AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-organizationconfiguration.html#cfn-securityhub-organizationconfiguration-autoenable
+	AutoEnable bool `json:"AutoEnable"`
+
+	// AutoEnableStandards AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-organizationconfiguration.html#cfn-securityhub-organizationconfiguration-autoenablestandards
+	AutoEnableStandards *string `json:"AutoEnableStandards,omitempty"`
+
+	// ConfigurationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-organizationconfiguration.html#cfn-securityhub-organizationconfiguration-configurationtype
+	ConfigurationType *string `json:"ConfigurationType,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 *OrganizationConfiguration) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::OrganizationConfiguration"
+}
+
+// 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 OrganizationConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties OrganizationConfiguration
+	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 *OrganizationConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties OrganizationConfiguration
+	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 = OrganizationConfiguration(*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/securityhub/aws-securityhub-policyassociation.go b/cloudformation/securityhub/aws-securityhub-policyassociation.go
new file mode 100644
index 0000000000..a22386a1e7
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-policyassociation.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// PolicyAssociation AWS CloudFormation Resource (AWS::SecurityHub::PolicyAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-policyassociation.html
+type PolicyAssociation struct {
+
+	// ConfigurationPolicyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-policyassociation.html#cfn-securityhub-policyassociation-configurationpolicyid
+	ConfigurationPolicyId string `json:"ConfigurationPolicyId"`
+
+	// TargetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-policyassociation.html#cfn-securityhub-policyassociation-targetid
+	TargetId string `json:"TargetId"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-policyassociation.html#cfn-securityhub-policyassociation-targettype
+	TargetType string `json:"TargetType"`
+
+	// 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 *PolicyAssociation) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::PolicyAssociation"
+}
+
+// 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 PolicyAssociation) MarshalJSON() ([]byte, error) {
+	type Properties PolicyAssociation
+	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 *PolicyAssociation) UnmarshalJSON(b []byte) error {
+	type Properties PolicyAssociation
+	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 = PolicyAssociation(*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/securityhub/aws-securityhub-securitycontrol.go b/cloudformation/securityhub/aws-securityhub-securitycontrol.go
new file mode 100644
index 0000000000..2b6d58be91
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-securitycontrol.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SecurityControl AWS CloudFormation Resource (AWS::SecurityHub::SecurityControl)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-securitycontrol.html
+type SecurityControl struct {
+
+	// LastUpdateReason AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-securitycontrol.html#cfn-securityhub-securitycontrol-lastupdatereason
+	LastUpdateReason *string `json:"LastUpdateReason,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-securitycontrol.html#cfn-securityhub-securitycontrol-parameters
+	Parameters map[string]SecurityControl_ParameterConfiguration `json:"Parameters"`
+
+	// SecurityControlArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-securitycontrol.html#cfn-securityhub-securitycontrol-securitycontrolarn
+	SecurityControlArn *string `json:"SecurityControlArn,omitempty"`
+
+	// SecurityControlId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-securitycontrol.html#cfn-securityhub-securitycontrol-securitycontrolid
+	SecurityControlId *string `json:"SecurityControlId,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 *SecurityControl) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::SecurityControl"
+}
+
+// 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 SecurityControl) MarshalJSON() ([]byte, error) {
+	type Properties SecurityControl
+	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 *SecurityControl) UnmarshalJSON(b []byte) error {
+	type Properties SecurityControl
+	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 = SecurityControl(*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/securityhub/aws-securityhub-securitycontrol_parameterconfiguration.go b/cloudformation/securityhub/aws-securityhub-securitycontrol_parameterconfiguration.go
new file mode 100644
index 0000000000..2eb778c864
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-securitycontrol_parameterconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SecurityControl_ParameterConfiguration AWS CloudFormation Resource (AWS::SecurityHub::SecurityControl.ParameterConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parameterconfiguration.html
+type SecurityControl_ParameterConfiguration struct {
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parameterconfiguration.html#cfn-securityhub-securitycontrol-parameterconfiguration-value
+	Value *SecurityControl_ParameterValue `json:"Value,omitempty"`
+
+	// ValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parameterconfiguration.html#cfn-securityhub-securitycontrol-parameterconfiguration-valuetype
+	ValueType string `json:"ValueType"`
+
+	// 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 *SecurityControl_ParameterConfiguration) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::SecurityControl.ParameterConfiguration"
+}
diff --git a/cloudformation/securityhub/aws-securityhub-securitycontrol_parametervalue.go b/cloudformation/securityhub/aws-securityhub-securitycontrol_parametervalue.go
new file mode 100644
index 0000000000..d862a91328
--- /dev/null
+++ b/cloudformation/securityhub/aws-securityhub-securitycontrol_parametervalue.go
@@ -0,0 +1,72 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securityhub
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SecurityControl_ParameterValue AWS CloudFormation Resource (AWS::SecurityHub::SecurityControl.ParameterValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html
+type SecurityControl_ParameterValue struct {
+
+	// Boolean AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-boolean
+	Boolean *bool `json:"Boolean,omitempty"`
+
+	// Double AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-double
+	Double *float64 `json:"Double,omitempty"`
+
+	// Enum AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-enum
+	Enum *string `json:"Enum,omitempty"`
+
+	// EnumList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-enumlist
+	EnumList []string `json:"EnumList,omitempty"`
+
+	// Integer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-integer
+	Integer *int `json:"Integer,omitempty"`
+
+	// IntegerList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-integerlist
+	IntegerList []int `json:"IntegerList,omitempty"`
+
+	// String AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-string
+	String *string `json:"String,omitempty"`
+
+	// StringList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securityhub-securitycontrol-parametervalue.html#cfn-securityhub-securitycontrol-parametervalue-stringlist
+	StringList []string `json:"StringList,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 *SecurityControl_ParameterValue) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::SecurityControl.ParameterValue"
+}
diff --git a/cloudformation/securitylake/aws-securitylake-subscribernotification.go b/cloudformation/securitylake/aws-securitylake-subscribernotification.go
new file mode 100644
index 0000000000..774ee89a70
--- /dev/null
+++ b/cloudformation/securitylake/aws-securitylake-subscribernotification.go
@@ -0,0 +1,122 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securitylake
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SubscriberNotification AWS CloudFormation Resource (AWS::SecurityLake::SubscriberNotification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securitylake-subscribernotification.html
+type SubscriberNotification struct {
+
+	// NotificationConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securitylake-subscribernotification.html#cfn-securitylake-subscribernotification-notificationconfiguration
+	NotificationConfiguration *SubscriberNotification_NotificationConfiguration `json:"NotificationConfiguration"`
+
+	// SubscriberArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securitylake-subscribernotification.html#cfn-securitylake-subscribernotification-subscriberarn
+	SubscriberArn string `json:"SubscriberArn"`
+
+	// 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 *SubscriberNotification) AWSCloudFormationType() string {
+	return "AWS::SecurityLake::SubscriberNotification"
+}
+
+// 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 SubscriberNotification) MarshalJSON() ([]byte, error) {
+	type Properties SubscriberNotification
+	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 *SubscriberNotification) UnmarshalJSON(b []byte) error {
+	type Properties SubscriberNotification
+	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 = SubscriberNotification(*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/securitylake/aws-securitylake-subscribernotification_httpsnotificationconfiguration.go b/cloudformation/securitylake/aws-securitylake-subscribernotification_httpsnotificationconfiguration.go
new file mode 100644
index 0000000000..73f6fc2806
--- /dev/null
+++ b/cloudformation/securitylake/aws-securitylake-subscribernotification_httpsnotificationconfiguration.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securitylake
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SubscriberNotification_HttpsNotificationConfiguration AWS CloudFormation Resource (AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-httpsnotificationconfiguration.html
+type SubscriberNotification_HttpsNotificationConfiguration struct {
+
+	// AuthorizationApiKeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-httpsnotificationconfiguration.html#cfn-securitylake-subscribernotification-httpsnotificationconfiguration-authorizationapikeyname
+	AuthorizationApiKeyName *string `json:"AuthorizationApiKeyName,omitempty"`
+
+	// AuthorizationApiKeyValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-httpsnotificationconfiguration.html#cfn-securitylake-subscribernotification-httpsnotificationconfiguration-authorizationapikeyvalue
+	AuthorizationApiKeyValue *string `json:"AuthorizationApiKeyValue,omitempty"`
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-httpsnotificationconfiguration.html#cfn-securitylake-subscribernotification-httpsnotificationconfiguration-endpoint
+	Endpoint string `json:"Endpoint"`
+
+	// HttpMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-httpsnotificationconfiguration.html#cfn-securitylake-subscribernotification-httpsnotificationconfiguration-httpmethod
+	HttpMethod *string `json:"HttpMethod,omitempty"`
+
+	// TargetRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-httpsnotificationconfiguration.html#cfn-securitylake-subscribernotification-httpsnotificationconfiguration-targetrolearn
+	TargetRoleArn string `json:"TargetRoleArn"`
+
+	// 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 *SubscriberNotification_HttpsNotificationConfiguration) AWSCloudFormationType() string {
+	return "AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration"
+}
diff --git a/cloudformation/securitylake/aws-securitylake-subscribernotification_notificationconfiguration.go b/cloudformation/securitylake/aws-securitylake-subscribernotification_notificationconfiguration.go
new file mode 100644
index 0000000000..7d9ef4b2f9
--- /dev/null
+++ b/cloudformation/securitylake/aws-securitylake-subscribernotification_notificationconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package securitylake
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// SubscriberNotification_NotificationConfiguration AWS CloudFormation Resource (AWS::SecurityLake::SubscriberNotification.NotificationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-notificationconfiguration.html
+type SubscriberNotification_NotificationConfiguration struct {
+
+	// HttpsNotificationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-notificationconfiguration.html#cfn-securitylake-subscribernotification-notificationconfiguration-httpsnotificationconfiguration
+	HttpsNotificationConfiguration *SubscriberNotification_HttpsNotificationConfiguration `json:"HttpsNotificationConfiguration,omitempty"`
+
+	// SqsNotificationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-securitylake-subscribernotification-notificationconfiguration.html#cfn-securitylake-subscribernotification-notificationconfiguration-sqsnotificationconfiguration
+	SqsNotificationConfiguration interface{} `json:"SqsNotificationConfiguration,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 *SubscriberNotification_NotificationConfiguration) AWSCloudFormationType() string {
+	return "AWS::SecurityLake::SubscriberNotification.NotificationConfiguration"
+}
diff --git a/cloudformation/ses/aws-ses-configurationseteventdestination_eventbridgedestination.go b/cloudformation/ses/aws-ses-configurationseteventdestination_eventbridgedestination.go
new file mode 100644
index 0000000000..1e1387bfd0
--- /dev/null
+++ b/cloudformation/ses/aws-ses-configurationseteventdestination_eventbridgedestination.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_EventBridgeDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventbridgedestination.html
+type ConfigurationSetEventDestination_EventBridgeDestination struct {
+
+	// EventBusArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventbridgedestination.html#cfn-ses-configurationseteventdestination-eventbridgedestination-eventbusarn
+	EventBusArn string `json:"EventBusArn"`
+
+	// 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 *ConfigurationSetEventDestination_EventBridgeDestination) AWSCloudFormationType() string {
+	return "AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination"
+}
diff --git a/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go b/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
index 9d4e101814..4fad5709e3 100644
--- a/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
+++ b/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
@@ -20,6 +20,11 @@ type ConfigurationSetEventDestination_EventDestination struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-enabled
 	Enabled *bool `json:"Enabled,omitempty"`
 
+	// EventBridgeDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-eventbridgedestination
+	EventBridgeDestination *ConfigurationSetEventDestination_EventBridgeDestination `json:"EventBridgeDestination,omitempty"`
+
 	// KinesisFirehoseDestination AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-kinesisfirehosedestination
diff --git a/cloudformation/ses/aws-ses-mailmanageraddoninstance.go b/cloudformation/ses/aws-ses-mailmanageraddoninstance.go
new file mode 100644
index 0000000000..38ec2dcf8f
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanageraddoninstance.go
@@ -0,0 +1,123 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MailManagerAddonInstance AWS CloudFormation Resource (AWS::SES::MailManagerAddonInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddoninstance.html
+type MailManagerAddonInstance struct {
+
+	// AddonSubscriptionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddoninstance.html#cfn-ses-mailmanageraddoninstance-addonsubscriptionid
+	AddonSubscriptionId string `json:"AddonSubscriptionId"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddoninstance.html#cfn-ses-mailmanageraddoninstance-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 *MailManagerAddonInstance) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerAddonInstance"
+}
+
+// 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 MailManagerAddonInstance) MarshalJSON() ([]byte, error) {
+	type Properties MailManagerAddonInstance
+	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 *MailManagerAddonInstance) UnmarshalJSON(b []byte) error {
+	type Properties MailManagerAddonInstance
+	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 = MailManagerAddonInstance(*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/ses/aws-ses-mailmanageraddonsubscription.go b/cloudformation/ses/aws-ses-mailmanageraddonsubscription.go
new file mode 100644
index 0000000000..ea777437bd
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanageraddonsubscription.go
@@ -0,0 +1,123 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MailManagerAddonSubscription AWS CloudFormation Resource (AWS::SES::MailManagerAddonSubscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddonsubscription.html
+type MailManagerAddonSubscription struct {
+
+	// AddonName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddonsubscription.html#cfn-ses-mailmanageraddonsubscription-addonname
+	AddonName string `json:"AddonName"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageraddonsubscription.html#cfn-ses-mailmanageraddonsubscription-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 *MailManagerAddonSubscription) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerAddonSubscription"
+}
+
+// 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 MailManagerAddonSubscription) MarshalJSON() ([]byte, error) {
+	type Properties MailManagerAddonSubscription
+	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 *MailManagerAddonSubscription) UnmarshalJSON(b []byte) error {
+	type Properties MailManagerAddonSubscription
+	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 = MailManagerAddonSubscription(*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/ses/aws-ses-mailmanagerarchive.go b/cloudformation/ses/aws-ses-mailmanagerarchive.go
new file mode 100644
index 0000000000..dc1656bfbb
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerarchive.go
@@ -0,0 +1,133 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MailManagerArchive AWS CloudFormation Resource (AWS::SES::MailManagerArchive)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerarchive.html
+type MailManagerArchive struct {
+
+	// ArchiveName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerarchive.html#cfn-ses-mailmanagerarchive-archivename
+	ArchiveName *string `json:"ArchiveName,omitempty"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerarchive.html#cfn-ses-mailmanagerarchive-kmskeyarn
+	KmsKeyArn *string `json:"KmsKeyArn,omitempty"`
+
+	// Retention AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerarchive.html#cfn-ses-mailmanagerarchive-retention
+	Retention *MailManagerArchive_ArchiveRetention `json:"Retention,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerarchive.html#cfn-ses-mailmanagerarchive-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 *MailManagerArchive) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerArchive"
+}
+
+// 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 MailManagerArchive) MarshalJSON() ([]byte, error) {
+	type Properties MailManagerArchive
+	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 *MailManagerArchive) UnmarshalJSON(b []byte) error {
+	type Properties MailManagerArchive
+	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 = MailManagerArchive(*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/ses/aws-ses-mailmanagerarchive_archiveretention.go b/cloudformation/ses/aws-ses-mailmanagerarchive_archiveretention.go
new file mode 100644
index 0000000000..c0e42253f4
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerarchive_archiveretention.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerArchive_ArchiveRetention AWS CloudFormation Resource (AWS::SES::MailManagerArchive.ArchiveRetention)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerarchive-archiveretention.html
+type MailManagerArchive_ArchiveRetention struct {
+
+	// RetentionPeriod AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerarchive-archiveretention.html#cfn-ses-mailmanagerarchive-archiveretention-retentionperiod
+	RetentionPeriod string `json:"RetentionPeriod"`
+
+	// 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 *MailManagerArchive_ArchiveRetention) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerArchive.ArchiveRetention"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanageringresspoint.go b/cloudformation/ses/aws-ses-mailmanageringresspoint.go
new file mode 100644
index 0000000000..9ef17af7e8
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanageringresspoint.go
@@ -0,0 +1,148 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MailManagerIngressPoint AWS CloudFormation Resource (AWS::SES::MailManagerIngressPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html
+type MailManagerIngressPoint struct {
+
+	// IngressPointConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html#cfn-ses-mailmanageringresspoint-ingresspointconfiguration
+	IngressPointConfiguration *MailManagerIngressPoint_IngressPointConfiguration `json:"IngressPointConfiguration,omitempty"`
+
+	// IngressPointName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html#cfn-ses-mailmanageringresspoint-ingresspointname
+	IngressPointName *string `json:"IngressPointName,omitempty"`
+
+	// RuleSetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html#cfn-ses-mailmanageringresspoint-rulesetid
+	RuleSetId string `json:"RuleSetId"`
+
+	// StatusToUpdate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html#cfn-ses-mailmanageringresspoint-statustoupdate
+	StatusToUpdate *string `json:"StatusToUpdate,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html#cfn-ses-mailmanageringresspoint-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// TrafficPolicyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html#cfn-ses-mailmanageringresspoint-trafficpolicyid
+	TrafficPolicyId string `json:"TrafficPolicyId"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanageringresspoint.html#cfn-ses-mailmanageringresspoint-type
+	Type string `json:"Type"`
+
+	// 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 *MailManagerIngressPoint) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerIngressPoint"
+}
+
+// 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 MailManagerIngressPoint) MarshalJSON() ([]byte, error) {
+	type Properties MailManagerIngressPoint
+	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 *MailManagerIngressPoint) UnmarshalJSON(b []byte) error {
+	type Properties MailManagerIngressPoint
+	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 = MailManagerIngressPoint(*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/ses/aws-ses-mailmanageringresspoint_ingresspointconfiguration.go b/cloudformation/ses/aws-ses-mailmanageringresspoint_ingresspointconfiguration.go
new file mode 100644
index 0000000000..5ddd6800cf
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanageringresspoint_ingresspointconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerIngressPoint_IngressPointConfiguration AWS CloudFormation Resource (AWS::SES::MailManagerIngressPoint.IngressPointConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanageringresspoint-ingresspointconfiguration.html
+type MailManagerIngressPoint_IngressPointConfiguration struct {
+
+	// SecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanageringresspoint-ingresspointconfiguration.html#cfn-ses-mailmanageringresspoint-ingresspointconfiguration-secretarn
+	SecretArn *string `json:"SecretArn,omitempty"`
+
+	// SmtpPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanageringresspoint-ingresspointconfiguration.html#cfn-ses-mailmanageringresspoint-ingresspointconfiguration-smtppassword
+	SmtpPassword *string `json:"SmtpPassword,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 *MailManagerIngressPoint_IngressPointConfiguration) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerIngressPoint.IngressPointConfiguration"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerrelay.go b/cloudformation/ses/aws-ses-mailmanagerrelay.go
new file mode 100644
index 0000000000..dcd72f7f60
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerrelay.go
@@ -0,0 +1,138 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MailManagerRelay AWS CloudFormation Resource (AWS::SES::MailManagerRelay)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerrelay.html
+type MailManagerRelay struct {
+
+	// Authentication AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerrelay.html#cfn-ses-mailmanagerrelay-authentication
+	Authentication *MailManagerRelay_RelayAuthentication `json:"Authentication"`
+
+	// RelayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerrelay.html#cfn-ses-mailmanagerrelay-relayname
+	RelayName *string `json:"RelayName,omitempty"`
+
+	// ServerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerrelay.html#cfn-ses-mailmanagerrelay-servername
+	ServerName string `json:"ServerName"`
+
+	// ServerPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerrelay.html#cfn-ses-mailmanagerrelay-serverport
+	ServerPort float64 `json:"ServerPort"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerrelay.html#cfn-ses-mailmanagerrelay-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 *MailManagerRelay) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRelay"
+}
+
+// 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 MailManagerRelay) MarshalJSON() ([]byte, error) {
+	type Properties MailManagerRelay
+	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 *MailManagerRelay) UnmarshalJSON(b []byte) error {
+	type Properties MailManagerRelay
+	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 = MailManagerRelay(*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/ses/aws-ses-mailmanagerrelay_relayauthentication.go b/cloudformation/ses/aws-ses-mailmanagerrelay_relayauthentication.go
new file mode 100644
index 0000000000..3c865788cc
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerrelay_relayauthentication.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRelay_RelayAuthentication AWS CloudFormation Resource (AWS::SES::MailManagerRelay.RelayAuthentication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerrelay-relayauthentication.html
+type MailManagerRelay_RelayAuthentication struct {
+
+	// NoAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerrelay-relayauthentication.html#cfn-ses-mailmanagerrelay-relayauthentication-noauthentication
+	NoAuthentication interface{} `json:"NoAuthentication,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerrelay-relayauthentication.html#cfn-ses-mailmanagerrelay-relayauthentication-secretarn
+	SecretArn *string `json:"SecretArn,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 *MailManagerRelay_RelayAuthentication) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRelay.RelayAuthentication"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset.go b/cloudformation/ses/aws-ses-mailmanagerruleset.go
new file mode 100644
index 0000000000..951aeb30dd
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset.go
@@ -0,0 +1,128 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MailManagerRuleSet AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerruleset.html
+type MailManagerRuleSet struct {
+
+	// RuleSetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerruleset.html#cfn-ses-mailmanagerruleset-rulesetname
+	RuleSetName *string `json:"RuleSetName,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerruleset.html#cfn-ses-mailmanagerruleset-rules
+	Rules []MailManagerRuleSet_Rule `json:"Rules"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagerruleset.html#cfn-ses-mailmanagerruleset-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 *MailManagerRuleSet) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet"
+}
+
+// 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 MailManagerRuleSet) MarshalJSON() ([]byte, error) {
+	type Properties MailManagerRuleSet
+	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 *MailManagerRuleSet) UnmarshalJSON(b []byte) error {
+	type Properties MailManagerRuleSet
+	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 = MailManagerRuleSet(*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/ses/aws-ses-mailmanagerruleset_addheaderaction.go b/cloudformation/ses/aws-ses-mailmanagerruleset_addheaderaction.go
new file mode 100644
index 0000000000..6dcea04be4
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_addheaderaction.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_AddHeaderAction AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.AddHeaderAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-addheaderaction.html
+type MailManagerRuleSet_AddHeaderAction struct {
+
+	// HeaderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-addheaderaction.html#cfn-ses-mailmanagerruleset-addheaderaction-headername
+	HeaderName string `json:"HeaderName"`
+
+	// HeaderValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-addheaderaction.html#cfn-ses-mailmanagerruleset-addheaderaction-headervalue
+	HeaderValue string `json:"HeaderValue"`
+
+	// 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 *MailManagerRuleSet_AddHeaderAction) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.AddHeaderAction"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_analysis.go b/cloudformation/ses/aws-ses-mailmanagerruleset_analysis.go
new file mode 100644
index 0000000000..71b585c328
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_analysis.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_Analysis AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.Analysis)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-analysis.html
+type MailManagerRuleSet_Analysis struct {
+
+	// Analyzer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-analysis.html#cfn-ses-mailmanagerruleset-analysis-analyzer
+	Analyzer string `json:"Analyzer"`
+
+	// ResultField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-analysis.html#cfn-ses-mailmanagerruleset-analysis-resultfield
+	ResultField string `json:"ResultField"`
+
+	// 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 *MailManagerRuleSet_Analysis) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.Analysis"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_archiveaction.go b/cloudformation/ses/aws-ses-mailmanagerruleset_archiveaction.go
new file mode 100644
index 0000000000..764fd5bc46
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_archiveaction.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_ArchiveAction AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.ArchiveAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-archiveaction.html
+type MailManagerRuleSet_ArchiveAction struct {
+
+	// ActionFailurePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-archiveaction.html#cfn-ses-mailmanagerruleset-archiveaction-actionfailurepolicy
+	ActionFailurePolicy *string `json:"ActionFailurePolicy,omitempty"`
+
+	// TargetArchive AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-archiveaction.html#cfn-ses-mailmanagerruleset-archiveaction-targetarchive
+	TargetArchive string `json:"TargetArchive"`
+
+	// 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 *MailManagerRuleSet_ArchiveAction) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.ArchiveAction"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_delivertomailboxaction.go b/cloudformation/ses/aws-ses-mailmanagerruleset_delivertomailboxaction.go
new file mode 100644
index 0000000000..9f1eda46ec
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_delivertomailboxaction.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_DeliverToMailboxAction AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.DeliverToMailboxAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-delivertomailboxaction.html
+type MailManagerRuleSet_DeliverToMailboxAction struct {
+
+	// ActionFailurePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-delivertomailboxaction.html#cfn-ses-mailmanagerruleset-delivertomailboxaction-actionfailurepolicy
+	ActionFailurePolicy *string `json:"ActionFailurePolicy,omitempty"`
+
+	// MailboxArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-delivertomailboxaction.html#cfn-ses-mailmanagerruleset-delivertomailboxaction-mailboxarn
+	MailboxArn string `json:"MailboxArn"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-delivertomailboxaction.html#cfn-ses-mailmanagerruleset-delivertomailboxaction-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MailManagerRuleSet_DeliverToMailboxAction) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.DeliverToMailboxAction"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_relayaction.go b/cloudformation/ses/aws-ses-mailmanagerruleset_relayaction.go
new file mode 100644
index 0000000000..4c1d01e715
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_relayaction.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RelayAction AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RelayAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-relayaction.html
+type MailManagerRuleSet_RelayAction struct {
+
+	// ActionFailurePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-relayaction.html#cfn-ses-mailmanagerruleset-relayaction-actionfailurepolicy
+	ActionFailurePolicy *string `json:"ActionFailurePolicy,omitempty"`
+
+	// MailFrom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-relayaction.html#cfn-ses-mailmanagerruleset-relayaction-mailfrom
+	MailFrom *string `json:"MailFrom,omitempty"`
+
+	// Relay AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-relayaction.html#cfn-ses-mailmanagerruleset-relayaction-relay
+	Relay string `json:"Relay"`
+
+	// 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 *MailManagerRuleSet_RelayAction) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RelayAction"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_replacerecipientaction.go b/cloudformation/ses/aws-ses-mailmanagerruleset_replacerecipientaction.go
new file mode 100644
index 0000000000..48071d7ce5
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_replacerecipientaction.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_ReplaceRecipientAction AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.ReplaceRecipientAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-replacerecipientaction.html
+type MailManagerRuleSet_ReplaceRecipientAction struct {
+
+	// ReplaceWith AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-replacerecipientaction.html#cfn-ses-mailmanagerruleset-replacerecipientaction-replacewith
+	ReplaceWith []string `json:"ReplaceWith,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 *MailManagerRuleSet_ReplaceRecipientAction) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.ReplaceRecipientAction"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rule.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rule.go
new file mode 100644
index 0000000000..6e00dde0ca
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rule.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_Rule AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rule.html
+type MailManagerRuleSet_Rule struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rule.html#cfn-ses-mailmanagerruleset-rule-actions
+	Actions []MailManagerRuleSet_RuleAction `json:"Actions"`
+
+	// Conditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rule.html#cfn-ses-mailmanagerruleset-rule-conditions
+	Conditions []MailManagerRuleSet_RuleCondition `json:"Conditions,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rule.html#cfn-ses-mailmanagerruleset-rule-name
+	Name *string `json:"Name,omitempty"`
+
+	// Unless AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rule.html#cfn-ses-mailmanagerruleset-rule-unless
+	Unless []MailManagerRuleSet_RuleCondition `json:"Unless,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 *MailManagerRuleSet_Rule) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.Rule"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_ruleaction.go b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleaction.go
new file mode 100644
index 0000000000..2b8140dc95
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleaction.go
@@ -0,0 +1,72 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleAction AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html
+type MailManagerRuleSet_RuleAction struct {
+
+	// AddHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-addheader
+	AddHeader *MailManagerRuleSet_AddHeaderAction `json:"AddHeader,omitempty"`
+
+	// Archive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-archive
+	Archive *MailManagerRuleSet_ArchiveAction `json:"Archive,omitempty"`
+
+	// DeliverToMailbox AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-delivertomailbox
+	DeliverToMailbox *MailManagerRuleSet_DeliverToMailboxAction `json:"DeliverToMailbox,omitempty"`
+
+	// Drop AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-drop
+	Drop interface{} `json:"Drop,omitempty"`
+
+	// Relay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-relay
+	Relay *MailManagerRuleSet_RelayAction `json:"Relay,omitempty"`
+
+	// ReplaceRecipient AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-replacerecipient
+	ReplaceRecipient *MailManagerRuleSet_ReplaceRecipientAction `json:"ReplaceRecipient,omitempty"`
+
+	// Send AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-send
+	Send *MailManagerRuleSet_SendAction `json:"Send,omitempty"`
+
+	// WriteToS3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleaction.html#cfn-ses-mailmanagerruleset-ruleaction-writetos3
+	WriteToS3 *MailManagerRuleSet_S3Action `json:"WriteToS3,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 *MailManagerRuleSet_RuleAction) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleAction"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleanexpression.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleanexpression.go
new file mode 100644
index 0000000000..c55dd91e68
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleanexpression.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleBooleanExpression AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleBooleanExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulebooleanexpression.html
+type MailManagerRuleSet_RuleBooleanExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulebooleanexpression.html#cfn-ses-mailmanagerruleset-rulebooleanexpression-evaluate
+	Evaluate *MailManagerRuleSet_RuleBooleanToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulebooleanexpression.html#cfn-ses-mailmanagerruleset-rulebooleanexpression-operator
+	Operator string `json:"Operator"`
+
+	// 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 *MailManagerRuleSet_RuleBooleanExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleBooleanExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleantoevaluate.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleantoevaluate.go
new file mode 100644
index 0000000000..26db4d90df
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rulebooleantoevaluate.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleBooleanToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulebooleantoevaluate.html
+type MailManagerRuleSet_RuleBooleanToEvaluate struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulebooleantoevaluate.html#cfn-ses-mailmanagerruleset-rulebooleantoevaluate-attribute
+	Attribute string `json:"Attribute"`
+
+	// 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 *MailManagerRuleSet_RuleBooleanToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rulecondition.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rulecondition.go
new file mode 100644
index 0000000000..cf1a6b4d66
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rulecondition.go
@@ -0,0 +1,62 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleCondition AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulecondition.html
+type MailManagerRuleSet_RuleCondition struct {
+
+	// BooleanExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulecondition.html#cfn-ses-mailmanagerruleset-rulecondition-booleanexpression
+	BooleanExpression *MailManagerRuleSet_RuleBooleanExpression `json:"BooleanExpression,omitempty"`
+
+	// DmarcExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulecondition.html#cfn-ses-mailmanagerruleset-rulecondition-dmarcexpression
+	DmarcExpression *MailManagerRuleSet_RuleDmarcExpression `json:"DmarcExpression,omitempty"`
+
+	// IpExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulecondition.html#cfn-ses-mailmanagerruleset-rulecondition-ipexpression
+	IpExpression *MailManagerRuleSet_RuleIpExpression `json:"IpExpression,omitempty"`
+
+	// NumberExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulecondition.html#cfn-ses-mailmanagerruleset-rulecondition-numberexpression
+	NumberExpression *MailManagerRuleSet_RuleNumberExpression `json:"NumberExpression,omitempty"`
+
+	// StringExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulecondition.html#cfn-ses-mailmanagerruleset-rulecondition-stringexpression
+	StringExpression *MailManagerRuleSet_RuleStringExpression `json:"StringExpression,omitempty"`
+
+	// VerdictExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulecondition.html#cfn-ses-mailmanagerruleset-rulecondition-verdictexpression
+	VerdictExpression *MailManagerRuleSet_RuleVerdictExpression `json:"VerdictExpression,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 *MailManagerRuleSet_RuleCondition) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleCondition"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_ruledmarcexpression.go b/cloudformation/ses/aws-ses-mailmanagerruleset_ruledmarcexpression.go
new file mode 100644
index 0000000000..3f18e13732
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_ruledmarcexpression.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleDmarcExpression AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleDmarcExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruledmarcexpression.html
+type MailManagerRuleSet_RuleDmarcExpression struct {
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruledmarcexpression.html#cfn-ses-mailmanagerruleset-ruledmarcexpression-operator
+	Operator string `json:"Operator"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruledmarcexpression.html#cfn-ses-mailmanagerruleset-ruledmarcexpression-values
+	Values []string `json:"Values"`
+
+	// 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 *MailManagerRuleSet_RuleDmarcExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleDmarcExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_ruleipexpression.go b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleipexpression.go
new file mode 100644
index 0000000000..1b55164c5a
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleipexpression.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleIpExpression AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleIpExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleipexpression.html
+type MailManagerRuleSet_RuleIpExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleipexpression.html#cfn-ses-mailmanagerruleset-ruleipexpression-evaluate
+	Evaluate *MailManagerRuleSet_RuleIpToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleipexpression.html#cfn-ses-mailmanagerruleset-ruleipexpression-operator
+	Operator string `json:"Operator"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleipexpression.html#cfn-ses-mailmanagerruleset-ruleipexpression-values
+	Values []string `json:"Values"`
+
+	// 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 *MailManagerRuleSet_RuleIpExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleIpExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_ruleiptoevaluate.go b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleiptoevaluate.go
new file mode 100644
index 0000000000..8384b59568
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleiptoevaluate.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleIpToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleIpToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleiptoevaluate.html
+type MailManagerRuleSet_RuleIpToEvaluate struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleiptoevaluate.html#cfn-ses-mailmanagerruleset-ruleiptoevaluate-attribute
+	Attribute string `json:"Attribute"`
+
+	// 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 *MailManagerRuleSet_RuleIpToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleIpToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rulenumberexpression.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rulenumberexpression.go
new file mode 100644
index 0000000000..5ec83b3cb0
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rulenumberexpression.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleNumberExpression AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleNumberExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulenumberexpression.html
+type MailManagerRuleSet_RuleNumberExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulenumberexpression.html#cfn-ses-mailmanagerruleset-rulenumberexpression-evaluate
+	Evaluate *MailManagerRuleSet_RuleNumberToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulenumberexpression.html#cfn-ses-mailmanagerruleset-rulenumberexpression-operator
+	Operator string `json:"Operator"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulenumberexpression.html#cfn-ses-mailmanagerruleset-rulenumberexpression-value
+	Value float64 `json:"Value"`
+
+	// 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 *MailManagerRuleSet_RuleNumberExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleNumberExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rulenumbertoevaluate.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rulenumbertoevaluate.go
new file mode 100644
index 0000000000..23e9896867
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rulenumbertoevaluate.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleNumberToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulenumbertoevaluate.html
+type MailManagerRuleSet_RuleNumberToEvaluate struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulenumbertoevaluate.html#cfn-ses-mailmanagerruleset-rulenumbertoevaluate-attribute
+	Attribute string `json:"Attribute"`
+
+	// 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 *MailManagerRuleSet_RuleNumberToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rulestringexpression.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rulestringexpression.go
new file mode 100644
index 0000000000..e3298b9dec
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rulestringexpression.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleStringExpression AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleStringExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulestringexpression.html
+type MailManagerRuleSet_RuleStringExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulestringexpression.html#cfn-ses-mailmanagerruleset-rulestringexpression-evaluate
+	Evaluate *MailManagerRuleSet_RuleStringToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulestringexpression.html#cfn-ses-mailmanagerruleset-rulestringexpression-operator
+	Operator string `json:"Operator"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulestringexpression.html#cfn-ses-mailmanagerruleset-rulestringexpression-values
+	Values []string `json:"Values"`
+
+	// 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 *MailManagerRuleSet_RuleStringExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleStringExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_rulestringtoevaluate.go b/cloudformation/ses/aws-ses-mailmanagerruleset_rulestringtoevaluate.go
new file mode 100644
index 0000000000..a2d34c9052
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_rulestringtoevaluate.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleStringToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleStringToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulestringtoevaluate.html
+type MailManagerRuleSet_RuleStringToEvaluate struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulestringtoevaluate.html#cfn-ses-mailmanagerruleset-rulestringtoevaluate-attribute
+	Attribute *string `json:"Attribute,omitempty"`
+
+	// MimeHeaderAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-rulestringtoevaluate.html#cfn-ses-mailmanagerruleset-rulestringtoevaluate-mimeheaderattribute
+	MimeHeaderAttribute *string `json:"MimeHeaderAttribute,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 *MailManagerRuleSet_RuleStringToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleStringToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdictexpression.go b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdictexpression.go
new file mode 100644
index 0000000000..e0eba0b62a
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdictexpression.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleVerdictExpression AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleVerdictExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleverdictexpression.html
+type MailManagerRuleSet_RuleVerdictExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleverdictexpression.html#cfn-ses-mailmanagerruleset-ruleverdictexpression-evaluate
+	Evaluate *MailManagerRuleSet_RuleVerdictToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleverdictexpression.html#cfn-ses-mailmanagerruleset-ruleverdictexpression-operator
+	Operator string `json:"Operator"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleverdictexpression.html#cfn-ses-mailmanagerruleset-ruleverdictexpression-values
+	Values []string `json:"Values"`
+
+	// 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 *MailManagerRuleSet_RuleVerdictExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleVerdictExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdicttoevaluate.go b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdicttoevaluate.go
new file mode 100644
index 0000000000..5f3e34dee1
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_ruleverdicttoevaluate.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_RuleVerdictToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleverdicttoevaluate.html
+type MailManagerRuleSet_RuleVerdictToEvaluate struct {
+
+	// Analysis AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleverdicttoevaluate.html#cfn-ses-mailmanagerruleset-ruleverdicttoevaluate-analysis
+	Analysis *MailManagerRuleSet_Analysis `json:"Analysis,omitempty"`
+
+	// Attribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-ruleverdicttoevaluate.html#cfn-ses-mailmanagerruleset-ruleverdicttoevaluate-attribute
+	Attribute *string `json:"Attribute,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 *MailManagerRuleSet_RuleVerdictToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_s3action.go b/cloudformation/ses/aws-ses-mailmanagerruleset_s3action.go
new file mode 100644
index 0000000000..6d43126aee
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_s3action.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_S3Action AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.S3Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-s3action.html
+type MailManagerRuleSet_S3Action struct {
+
+	// ActionFailurePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-s3action.html#cfn-ses-mailmanagerruleset-s3action-actionfailurepolicy
+	ActionFailurePolicy *string `json:"ActionFailurePolicy,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-s3action.html#cfn-ses-mailmanagerruleset-s3action-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-s3action.html#cfn-ses-mailmanagerruleset-s3action-s3bucket
+	S3Bucket string `json:"S3Bucket"`
+
+	// S3Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-s3action.html#cfn-ses-mailmanagerruleset-s3action-s3prefix
+	S3Prefix *string `json:"S3Prefix,omitempty"`
+
+	// S3SseKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-s3action.html#cfn-ses-mailmanagerruleset-s3action-s3ssekmskeyid
+	S3SseKmsKeyId *string `json:"S3SseKmsKeyId,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 *MailManagerRuleSet_S3Action) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.S3Action"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagerruleset_sendaction.go b/cloudformation/ses/aws-ses-mailmanagerruleset_sendaction.go
new file mode 100644
index 0000000000..7304ea2e4e
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagerruleset_sendaction.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerRuleSet_SendAction AWS CloudFormation Resource (AWS::SES::MailManagerRuleSet.SendAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-sendaction.html
+type MailManagerRuleSet_SendAction struct {
+
+	// ActionFailurePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-sendaction.html#cfn-ses-mailmanagerruleset-sendaction-actionfailurepolicy
+	ActionFailurePolicy *string `json:"ActionFailurePolicy,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagerruleset-sendaction.html#cfn-ses-mailmanagerruleset-sendaction-rolearn
+	RoleArn string `json:"RoleArn"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MailManagerRuleSet_SendAction) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerRuleSet.SendAction"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy.go
new file mode 100644
index 0000000000..f450c4eee7
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy.go
@@ -0,0 +1,138 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// MailManagerTrafficPolicy AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagertrafficpolicy.html
+type MailManagerTrafficPolicy struct {
+
+	// DefaultAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagertrafficpolicy.html#cfn-ses-mailmanagertrafficpolicy-defaultaction
+	DefaultAction string `json:"DefaultAction"`
+
+	// MaxMessageSizeBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagertrafficpolicy.html#cfn-ses-mailmanagertrafficpolicy-maxmessagesizebytes
+	MaxMessageSizeBytes *float64 `json:"MaxMessageSizeBytes,omitempty"`
+
+	// PolicyStatements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagertrafficpolicy.html#cfn-ses-mailmanagertrafficpolicy-policystatements
+	PolicyStatements []MailManagerTrafficPolicy_PolicyStatement `json:"PolicyStatements"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagertrafficpolicy.html#cfn-ses-mailmanagertrafficpolicy-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// TrafficPolicyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-mailmanagertrafficpolicy.html#cfn-ses-mailmanagertrafficpolicy-trafficpolicyname
+	TrafficPolicyName *string `json:"TrafficPolicyName,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 *MailManagerTrafficPolicy) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy"
+}
+
+// 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 MailManagerTrafficPolicy) MarshalJSON() ([]byte, error) {
+	type Properties MailManagerTrafficPolicy
+	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 *MailManagerTrafficPolicy) UnmarshalJSON(b []byte) error {
+	type Properties MailManagerTrafficPolicy
+	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 = MailManagerTrafficPolicy(*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/ses/aws-ses-mailmanagertrafficpolicy_ingressanalysis.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressanalysis.go
new file mode 100644
index 0000000000..8edc257ed7
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressanalysis.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressAnalysis AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressAnalysis)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressanalysis.html
+type MailManagerTrafficPolicy_IngressAnalysis struct {
+
+	// Analyzer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressanalysis.html#cfn-ses-mailmanagertrafficpolicy-ingressanalysis-analyzer
+	Analyzer string `json:"Analyzer"`
+
+	// ResultField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressanalysis.html#cfn-ses-mailmanagertrafficpolicy-ingressanalysis-resultfield
+	ResultField string `json:"ResultField"`
+
+	// 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 *MailManagerTrafficPolicy_IngressAnalysis) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressAnalysis"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleanexpression.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleanexpression.go
new file mode 100644
index 0000000000..4a53c3596b
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleanexpression.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressBooleanExpression AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressbooleanexpression.html
+type MailManagerTrafficPolicy_IngressBooleanExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressbooleanexpression.html#cfn-ses-mailmanagertrafficpolicy-ingressbooleanexpression-evaluate
+	Evaluate *MailManagerTrafficPolicy_IngressBooleanToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressbooleanexpression.html#cfn-ses-mailmanagertrafficpolicy-ingressbooleanexpression-operator
+	Operator string `json:"Operator"`
+
+	// 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 *MailManagerTrafficPolicy_IngressBooleanExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleantoevaluate.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleantoevaluate.go
new file mode 100644
index 0000000000..6b4c29b663
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressbooleantoevaluate.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressBooleanToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressbooleantoevaluate.html
+type MailManagerTrafficPolicy_IngressBooleanToEvaluate struct {
+
+	// Analysis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressbooleantoevaluate.html#cfn-ses-mailmanagertrafficpolicy-ingressbooleantoevaluate-analysis
+	Analysis *MailManagerTrafficPolicy_IngressAnalysis `json:"Analysis"`
+
+	// 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 *MailManagerTrafficPolicy_IngressBooleanToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressiptoevaluate.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressiptoevaluate.go
new file mode 100644
index 0000000000..e4ad36ea99
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressiptoevaluate.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressIpToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressiptoevaluate.html
+type MailManagerTrafficPolicy_IngressIpToEvaluate struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressiptoevaluate.html#cfn-ses-mailmanagertrafficpolicy-ingressiptoevaluate-attribute
+	Attribute string `json:"Attribute"`
+
+	// 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 *MailManagerTrafficPolicy_IngressIpToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressipv4expression.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressipv4expression.go
new file mode 100644
index 0000000000..6ff87a1cdf
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressipv4expression.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressIpv4Expression AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressipv4expression.html
+type MailManagerTrafficPolicy_IngressIpv4Expression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressipv4expression.html#cfn-ses-mailmanagertrafficpolicy-ingressipv4expression-evaluate
+	Evaluate *MailManagerTrafficPolicy_IngressIpToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressipv4expression.html#cfn-ses-mailmanagertrafficpolicy-ingressipv4expression-operator
+	Operator string `json:"Operator"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressipv4expression.html#cfn-ses-mailmanagertrafficpolicy-ingressipv4expression-values
+	Values []string `json:"Values"`
+
+	// 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 *MailManagerTrafficPolicy_IngressIpv4Expression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringexpression.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringexpression.go
new file mode 100644
index 0000000000..0faa745019
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringexpression.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressStringExpression AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressStringExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressstringexpression.html
+type MailManagerTrafficPolicy_IngressStringExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressstringexpression.html#cfn-ses-mailmanagertrafficpolicy-ingressstringexpression-evaluate
+	Evaluate *MailManagerTrafficPolicy_IngressStringToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressstringexpression.html#cfn-ses-mailmanagertrafficpolicy-ingressstringexpression-operator
+	Operator string `json:"Operator"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressstringexpression.html#cfn-ses-mailmanagertrafficpolicy-ingressstringexpression-values
+	Values []string `json:"Values"`
+
+	// 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 *MailManagerTrafficPolicy_IngressStringExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressStringExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringtoevaluate.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringtoevaluate.go
new file mode 100644
index 0000000000..4826645373
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingressstringtoevaluate.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressStringToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressstringtoevaluate.html
+type MailManagerTrafficPolicy_IngressStringToEvaluate struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingressstringtoevaluate.html#cfn-ses-mailmanagertrafficpolicy-ingressstringtoevaluate-attribute
+	Attribute string `json:"Attribute"`
+
+	// 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 *MailManagerTrafficPolicy_IngressStringToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocolexpression.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocolexpression.go
new file mode 100644
index 0000000000..bd141e3bc6
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocolexpression.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressTlsProtocolExpression AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingresstlsprotocolexpression.html
+type MailManagerTrafficPolicy_IngressTlsProtocolExpression struct {
+
+	// Evaluate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingresstlsprotocolexpression.html#cfn-ses-mailmanagertrafficpolicy-ingresstlsprotocolexpression-evaluate
+	Evaluate *MailManagerTrafficPolicy_IngressTlsProtocolToEvaluate `json:"Evaluate"`
+
+	// Operator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingresstlsprotocolexpression.html#cfn-ses-mailmanagertrafficpolicy-ingresstlsprotocolexpression-operator
+	Operator string `json:"Operator"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingresstlsprotocolexpression.html#cfn-ses-mailmanagertrafficpolicy-ingresstlsprotocolexpression-value
+	Value string `json:"Value"`
+
+	// 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 *MailManagerTrafficPolicy_IngressTlsProtocolExpression) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocoltoevaluate.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocoltoevaluate.go
new file mode 100644
index 0000000000..989b515815
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_ingresstlsprotocoltoevaluate.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_IngressTlsProtocolToEvaluate AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingresstlsprotocoltoevaluate.html
+type MailManagerTrafficPolicy_IngressTlsProtocolToEvaluate struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-ingresstlsprotocoltoevaluate.html#cfn-ses-mailmanagertrafficpolicy-ingresstlsprotocoltoevaluate-attribute
+	Attribute string `json:"Attribute"`
+
+	// 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 *MailManagerTrafficPolicy_IngressTlsProtocolToEvaluate) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policycondition.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policycondition.go
new file mode 100644
index 0000000000..c4c8565399
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policycondition.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_PolicyCondition AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.PolicyCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policycondition.html
+type MailManagerTrafficPolicy_PolicyCondition struct {
+
+	// BooleanExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policycondition.html#cfn-ses-mailmanagertrafficpolicy-policycondition-booleanexpression
+	BooleanExpression *MailManagerTrafficPolicy_IngressBooleanExpression `json:"BooleanExpression,omitempty"`
+
+	// IpExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policycondition.html#cfn-ses-mailmanagertrafficpolicy-policycondition-ipexpression
+	IpExpression *MailManagerTrafficPolicy_IngressIpv4Expression `json:"IpExpression,omitempty"`
+
+	// StringExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policycondition.html#cfn-ses-mailmanagertrafficpolicy-policycondition-stringexpression
+	StringExpression *MailManagerTrafficPolicy_IngressStringExpression `json:"StringExpression,omitempty"`
+
+	// TlsExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policycondition.html#cfn-ses-mailmanagertrafficpolicy-policycondition-tlsexpression
+	TlsExpression *MailManagerTrafficPolicy_IngressTlsProtocolExpression `json:"TlsExpression,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 *MailManagerTrafficPolicy_PolicyCondition) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.PolicyCondition"
+}
diff --git a/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policystatement.go b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policystatement.go
new file mode 100644
index 0000000000..df3959a686
--- /dev/null
+++ b/cloudformation/ses/aws-ses-mailmanagertrafficpolicy_policystatement.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ses
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// MailManagerTrafficPolicy_PolicyStatement AWS CloudFormation Resource (AWS::SES::MailManagerTrafficPolicy.PolicyStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policystatement.html
+type MailManagerTrafficPolicy_PolicyStatement struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policystatement.html#cfn-ses-mailmanagertrafficpolicy-policystatement-action
+	Action string `json:"Action"`
+
+	// Conditions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-mailmanagertrafficpolicy-policystatement.html#cfn-ses-mailmanagertrafficpolicy-policystatement-conditions
+	Conditions []MailManagerTrafficPolicy_PolicyCondition `json:"Conditions"`
+
+	// 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 *MailManagerTrafficPolicy_PolicyStatement) AWSCloudFormationType() string {
+	return "AWS::SES::MailManagerTrafficPolicy.PolicyStatement"
+}
diff --git a/cloudformation/ses/aws-ses-receiptrule_s3action.go b/cloudformation/ses/aws-ses-receiptrule_s3action.go
index 93a06aeb26..68ade19f0e 100644
--- a/cloudformation/ses/aws-ses-receiptrule_s3action.go
+++ b/cloudformation/ses/aws-ses-receiptrule_s3action.go
@@ -15,6 +15,11 @@ type ReceiptRule_S3Action struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-s3action.html#cfn-ses-receiptrule-s3action-bucketname
 	BucketName string `json:"BucketName"`
 
+	// IamRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-s3action.html#cfn-ses-receiptrule-s3action-iamrolearn
+	IamRoleArn *string `json:"IamRoleArn,omitempty"`
+
 	// KmsKeyArn AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-s3action.html#cfn-ses-receiptrule-s3action-kmskeyarn
diff --git a/cloudformation/sns/aws-sns-subscription.go b/cloudformation/sns/aws-sns-subscription.go
index bd714a6d57..376062ede6 100644
--- a/cloudformation/sns/aws-sns-subscription.go
+++ b/cloudformation/sns/aws-sns-subscription.go
@@ -20,7 +20,7 @@ type Subscription struct {
 
 	// Endpoint AWS CloudFormation Property
 	// Required: false
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-endpoint
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-endpoint
 	Endpoint *string `json:"Endpoint,omitempty"`
 
 	// FilterPolicy AWS CloudFormation Property
@@ -35,7 +35,7 @@ type Subscription struct {
 
 	// Protocol AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-protocol
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-protocol
 	Protocol string `json:"Protocol"`
 
 	// RawMessageDelivery AWS CloudFormation Property
@@ -65,7 +65,7 @@ type Subscription struct {
 
 	// TopicArn AWS CloudFormation Property
 	// Required: true
-	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#topicarn
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-topicarn
 	TopicArn string `json:"TopicArn"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
diff --git a/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager.go b/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager.go
new file mode 100644
index 0000000000..7c2c8b5288
--- /dev/null
+++ b/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager.go
@@ -0,0 +1,132 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ssmquicksetup
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationManager AWS CloudFormation Resource (AWS::SSMQuickSetup::ConfigurationManager)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmquicksetup-configurationmanager.html
+type ConfigurationManager struct {
+
+	// ConfigurationDefinitions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmquicksetup-configurationmanager.html#cfn-ssmquicksetup-configurationmanager-configurationdefinitions
+	ConfigurationDefinitions []ConfigurationManager_ConfigurationDefinition `json:"ConfigurationDefinitions"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmquicksetup-configurationmanager.html#cfn-ssmquicksetup-configurationmanager-description
+	Description *string `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmquicksetup-configurationmanager.html#cfn-ssmquicksetup-configurationmanager-name
+	Name *string `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmquicksetup-configurationmanager.html#cfn-ssmquicksetup-configurationmanager-tags
+	Tags map[string]string `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 *ConfigurationManager) AWSCloudFormationType() string {
+	return "AWS::SSMQuickSetup::ConfigurationManager"
+}
+
+// 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 ConfigurationManager) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationManager
+	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 *ConfigurationManager) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationManager
+	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 = ConfigurationManager(*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/ssmquicksetup/aws-ssmquicksetup-configurationmanager_configurationdefinition.go b/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager_configurationdefinition.go
new file mode 100644
index 0000000000..04f51ab90f
--- /dev/null
+++ b/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager_configurationdefinition.go
@@ -0,0 +1,62 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ssmquicksetup
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationManager_ConfigurationDefinition AWS CloudFormation Resource (AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-configurationdefinition.html
+type ConfigurationManager_ConfigurationDefinition struct {
+
+	// LocalDeploymentAdministrationRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-configurationdefinition.html#cfn-ssmquicksetup-configurationmanager-configurationdefinition-localdeploymentadministrationrolearn
+	LocalDeploymentAdministrationRoleArn *string `json:"LocalDeploymentAdministrationRoleArn,omitempty"`
+
+	// LocalDeploymentExecutionRoleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-configurationdefinition.html#cfn-ssmquicksetup-configurationmanager-configurationdefinition-localdeploymentexecutionrolename
+	LocalDeploymentExecutionRoleName *string `json:"LocalDeploymentExecutionRoleName,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-configurationdefinition.html#cfn-ssmquicksetup-configurationmanager-configurationdefinition-parameters
+	Parameters map[string]string `json:"Parameters"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-configurationdefinition.html#cfn-ssmquicksetup-configurationmanager-configurationdefinition-type
+	Type string `json:"Type"`
+
+	// TypeVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-configurationdefinition.html#cfn-ssmquicksetup-configurationmanager-configurationdefinition-typeversion
+	TypeVersion *string `json:"TypeVersion,omitempty"`
+
+	// id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-configurationdefinition.html#cfn-ssmquicksetup-configurationmanager-configurationdefinition-id
+	id *string `json:"id,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 *ConfigurationManager_ConfigurationDefinition) AWSCloudFormationType() string {
+	return "AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition"
+}
diff --git a/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager_statussummary.go b/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager_statussummary.go
new file mode 100644
index 0000000000..8dd94ce419
--- /dev/null
+++ b/cloudformation/ssmquicksetup/aws-ssmquicksetup-configurationmanager_statussummary.go
@@ -0,0 +1,57 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package ssmquicksetup
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ConfigurationManager_StatusSummary AWS CloudFormation Resource (AWS::SSMQuickSetup::ConfigurationManager.StatusSummary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-statussummary.html
+type ConfigurationManager_StatusSummary struct {
+
+	// LastUpdatedAt AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-statussummary.html#cfn-ssmquicksetup-configurationmanager-statussummary-lastupdatedat
+	LastUpdatedAt string `json:"LastUpdatedAt"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-statussummary.html#cfn-ssmquicksetup-configurationmanager-statussummary-status
+	Status *string `json:"Status,omitempty"`
+
+	// StatusDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-statussummary.html#cfn-ssmquicksetup-configurationmanager-statussummary-statusdetails
+	StatusDetails map[string]string `json:"StatusDetails,omitempty"`
+
+	// StatusMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-statussummary.html#cfn-ssmquicksetup-configurationmanager-statussummary-statusmessage
+	StatusMessage *string `json:"StatusMessage,omitempty"`
+
+	// StatusType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmquicksetup-configurationmanager-statussummary.html#cfn-ssmquicksetup-configurationmanager-statussummary-statustype
+	StatusType string `json:"StatusType"`
+
+	// 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 *ConfigurationManager_StatusSummary) AWSCloudFormationType() string {
+	return "AWS::SSMQuickSetup::ConfigurationManager.StatusSummary"
+}
diff --git a/cloudformation/sso/aws-sso-application.go b/cloudformation/sso/aws-sso-application.go
new file mode 100644
index 0000000000..8dce2f6b72
--- /dev/null
+++ b/cloudformation/sso/aws-sso-application.go
@@ -0,0 +1,148 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sso
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Application AWS CloudFormation Resource (AWS::SSO::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html
+type Application struct {
+
+	// ApplicationProviderArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html#cfn-sso-application-applicationproviderarn
+	ApplicationProviderArn string `json:"ApplicationProviderArn"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html#cfn-sso-application-description
+	Description *string `json:"Description,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html#cfn-sso-application-instancearn
+	InstanceArn string `json:"InstanceArn"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html#cfn-sso-application-name
+	Name string `json:"Name"`
+
+	// PortalOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html#cfn-sso-application-portaloptions
+	PortalOptions *Application_PortalOptionsConfiguration `json:"PortalOptions,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html#cfn-sso-application-status
+	Status *string `json:"Status,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-application.html#cfn-sso-application-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 *Application) AWSCloudFormationType() string {
+	return "AWS::SSO::Application"
+}
+
+// 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 Application) MarshalJSON() ([]byte, error) {
+	type Properties Application
+	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 *Application) UnmarshalJSON(b []byte) error {
+	type Properties Application
+	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 = Application(*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/sso/aws-sso-application_portaloptionsconfiguration.go b/cloudformation/sso/aws-sso-application_portaloptionsconfiguration.go
new file mode 100644
index 0000000000..b1f8c24abc
--- /dev/null
+++ b/cloudformation/sso/aws-sso-application_portaloptionsconfiguration.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sso
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_PortalOptionsConfiguration AWS CloudFormation Resource (AWS::SSO::Application.PortalOptionsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-application-portaloptionsconfiguration.html
+type Application_PortalOptionsConfiguration struct {
+
+	// SignInOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-application-portaloptionsconfiguration.html#cfn-sso-application-portaloptionsconfiguration-signinoptions
+	SignInOptions *Application_SignInOptions `json:"SignInOptions,omitempty"`
+
+	// Visibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-application-portaloptionsconfiguration.html#cfn-sso-application-portaloptionsconfiguration-visibility
+	Visibility *string `json:"Visibility,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 *Application_PortalOptionsConfiguration) AWSCloudFormationType() string {
+	return "AWS::SSO::Application.PortalOptionsConfiguration"
+}
diff --git a/cloudformation/sso/aws-sso-application_signinoptions.go b/cloudformation/sso/aws-sso-application_signinoptions.go
new file mode 100644
index 0000000000..349dc03fd8
--- /dev/null
+++ b/cloudformation/sso/aws-sso-application_signinoptions.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sso
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Application_SignInOptions AWS CloudFormation Resource (AWS::SSO::Application.SignInOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-application-signinoptions.html
+type Application_SignInOptions struct {
+
+	// ApplicationUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-application-signinoptions.html#cfn-sso-application-signinoptions-applicationurl
+	ApplicationUrl *string `json:"ApplicationUrl,omitempty"`
+
+	// Origin AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-application-signinoptions.html#cfn-sso-application-signinoptions-origin
+	Origin string `json:"Origin"`
+
+	// 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 *Application_SignInOptions) AWSCloudFormationType() string {
+	return "AWS::SSO::Application.SignInOptions"
+}
diff --git a/cloudformation/sso/aws-sso-applicationassignment.go b/cloudformation/sso/aws-sso-applicationassignment.go
new file mode 100644
index 0000000000..77c6b5f26c
--- /dev/null
+++ b/cloudformation/sso/aws-sso-applicationassignment.go
@@ -0,0 +1,127 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sso
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// ApplicationAssignment AWS CloudFormation Resource (AWS::SSO::ApplicationAssignment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-applicationassignment.html
+type ApplicationAssignment struct {
+
+	// ApplicationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-applicationassignment.html#cfn-sso-applicationassignment-applicationarn
+	ApplicationArn string `json:"ApplicationArn"`
+
+	// PrincipalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-applicationassignment.html#cfn-sso-applicationassignment-principalid
+	PrincipalId string `json:"PrincipalId"`
+
+	// PrincipalType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-applicationassignment.html#cfn-sso-applicationassignment-principaltype
+	PrincipalType string `json:"PrincipalType"`
+
+	// 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 *ApplicationAssignment) AWSCloudFormationType() string {
+	return "AWS::SSO::ApplicationAssignment"
+}
+
+// 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 ApplicationAssignment) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationAssignment
+	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 *ApplicationAssignment) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationAssignment
+	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 = ApplicationAssignment(*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/sso/aws-sso-instance.go b/cloudformation/sso/aws-sso-instance.go
new file mode 100644
index 0000000000..264d4fb7e0
--- /dev/null
+++ b/cloudformation/sso/aws-sso-instance.go
@@ -0,0 +1,123 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package sso
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// Instance AWS CloudFormation Resource (AWS::SSO::Instance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instance.html
+type Instance struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instance.html#cfn-sso-instance-name
+	Name *string `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instance.html#cfn-sso-instance-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 *Instance) AWSCloudFormationType() string {
+	return "AWS::SSO::Instance"
+}
+
+// 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 Instance) MarshalJSON() ([]byte, error) {
+	type Properties Instance
+	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 *Instance) UnmarshalJSON(b []byte) error {
+	type Properties Instance
+	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 = Instance(*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/stepfunctions/aws-stepfunctions-activity.go b/cloudformation/stepfunctions/aws-stepfunctions-activity.go
index 90c485ac29..5cab9454a8 100644
--- a/cloudformation/stepfunctions/aws-stepfunctions-activity.go
+++ b/cloudformation/stepfunctions/aws-stepfunctions-activity.go
@@ -13,6 +13,11 @@ import (
 // See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html
 type Activity struct {
 
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-encryptionconfiguration
+	EncryptionConfiguration *Activity_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
 	// Name AWS CloudFormation Property
 	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name
diff --git a/cloudformation/stepfunctions/aws-stepfunctions-activity_encryptionconfiguration.go b/cloudformation/stepfunctions/aws-stepfunctions-activity_encryptionconfiguration.go
new file mode 100644
index 0000000000..0cfe7fa18b
--- /dev/null
+++ b/cloudformation/stepfunctions/aws-stepfunctions-activity_encryptionconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package stepfunctions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// Activity_EncryptionConfiguration AWS CloudFormation Resource (AWS::StepFunctions::Activity.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-encryptionconfiguration.html
+type Activity_EncryptionConfiguration struct {
+
+	// KmsDataKeyReusePeriodSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-encryptionconfiguration.html#cfn-stepfunctions-activity-encryptionconfiguration-kmsdatakeyreuseperiodseconds
+	KmsDataKeyReusePeriodSeconds *int `json:"KmsDataKeyReusePeriodSeconds,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-encryptionconfiguration.html#cfn-stepfunctions-activity-encryptionconfiguration-kmskeyid
+	KmsKeyId *string `json:"KmsKeyId,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-encryptionconfiguration.html#cfn-stepfunctions-activity-encryptionconfiguration-type
+	Type string `json:"Type"`
+
+	// 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 *Activity_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::Activity.EncryptionConfiguration"
+}
diff --git a/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go b/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
index 494abfe60d..a57d36aab4 100644
--- a/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
+++ b/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
@@ -33,6 +33,11 @@ type StateMachine struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionsubstitutions
 	DefinitionSubstitutions map[string]interface{} `json:"DefinitionSubstitutions,omitempty"`
 
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-encryptionconfiguration
+	EncryptionConfiguration *StateMachine_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
 	// LoggingConfiguration AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-loggingconfiguration
diff --git a/cloudformation/stepfunctions/aws-stepfunctions-statemachine_encryptionconfiguration.go b/cloudformation/stepfunctions/aws-stepfunctions-statemachine_encryptionconfiguration.go
new file mode 100644
index 0000000000..466d6ffa50
--- /dev/null
+++ b/cloudformation/stepfunctions/aws-stepfunctions-statemachine_encryptionconfiguration.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package stepfunctions
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// StateMachine_EncryptionConfiguration AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-encryptionconfiguration.html
+type StateMachine_EncryptionConfiguration struct {
+
+	// KmsDataKeyReusePeriodSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-encryptionconfiguration.html#cfn-stepfunctions-statemachine-encryptionconfiguration-kmsdatakeyreuseperiodseconds
+	KmsDataKeyReusePeriodSeconds *int `json:"KmsDataKeyReusePeriodSeconds,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-encryptionconfiguration.html#cfn-stepfunctions-statemachine-encryptionconfiguration-kmskeyid
+	KmsKeyId *string `json:"KmsKeyId,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-encryptionconfiguration.html#cfn-stepfunctions-statemachine-encryptionconfiguration-type
+	Type string `json:"Type"`
+
+	// 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 *StateMachine_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.EncryptionConfiguration"
+}
diff --git a/cloudformation/synthetics/aws-synthetics-canary.go b/cloudformation/synthetics/aws-synthetics-canary.go
index 5c00a342ef..825f466d79 100644
--- a/cloudformation/synthetics/aws-synthetics-canary.go
+++ b/cloudformation/synthetics/aws-synthetics-canary.go
@@ -44,6 +44,11 @@ type Canary struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-name
 	Name string `json:"Name"`
 
+	// ResourcesToReplicateTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-resourcestoreplicatetags
+	ResourcesToReplicateTags []string `json:"ResourcesToReplicateTags,omitempty"`
+
 	// RunConfig AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-runconfig
diff --git a/cloudformation/systemsmanagersap/aws-systemsmanagersap-application.go b/cloudformation/systemsmanagersap/aws-systemsmanagersap-application.go
index 4e07ebca41..ffcb28d970 100644
--- a/cloudformation/systemsmanagersap/aws-systemsmanagersap-application.go
+++ b/cloudformation/systemsmanagersap/aws-systemsmanagersap-application.go
@@ -29,6 +29,11 @@ type Application struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-systemsmanagersap-application.html#cfn-systemsmanagersap-application-credentials
 	Credentials []Application_Credential `json:"Credentials,omitempty"`
 
+	// DatabaseArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-systemsmanagersap-application.html#cfn-systemsmanagersap-application-databasearn
+	DatabaseArn *string `json:"DatabaseArn,omitempty"`
+
 	// Instances AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-systemsmanagersap-application.html#cfn-systemsmanagersap-application-instances
diff --git a/cloudformation/transfer/aws-transfer-connector.go b/cloudformation/transfer/aws-transfer-connector.go
index 9a6268bbc4..e9cbe031a9 100644
--- a/cloudformation/transfer/aws-transfer-connector.go
+++ b/cloudformation/transfer/aws-transfer-connector.go
@@ -29,6 +29,11 @@ type Connector struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-connector.html#cfn-transfer-connector-loggingrole
 	LoggingRole *string `json:"LoggingRole,omitempty"`
 
+	// SecurityPolicyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-connector.html#cfn-transfer-connector-securitypolicyname
+	SecurityPolicyName *string `json:"SecurityPolicyName,omitempty"`
+
 	// SftpConfig AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-connector.html#cfn-transfer-connector-sftpconfig
diff --git a/cloudformation/transfer/aws-transfer-workflow_decryptstepdetails.go b/cloudformation/transfer/aws-transfer-workflow_decryptstepdetails.go
index 559dfcc1cb..b391021aac 100644
--- a/cloudformation/transfer/aws-transfer-workflow_decryptstepdetails.go
+++ b/cloudformation/transfer/aws-transfer-workflow_decryptstepdetails.go
@@ -11,9 +11,9 @@ import (
 type Workflow_DecryptStepDetails struct {
 
 	// DestinationFileLocation AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-decryptstepdetails.html#cfn-transfer-workflow-decryptstepdetails-destinationfilelocation
-	DestinationFileLocation *Workflow_InputFileLocation `json:"DestinationFileLocation,omitempty"`
+	DestinationFileLocation *Workflow_InputFileLocation `json:"DestinationFileLocation"`
 
 	// Name AWS CloudFormation Property
 	// Required: false
@@ -31,9 +31,9 @@ type Workflow_DecryptStepDetails struct {
 	SourceFileLocation *string `json:"SourceFileLocation,omitempty"`
 
 	// Type AWS CloudFormation Property
-	// Required: false
+	// Required: true
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-decryptstepdetails.html#cfn-transfer-workflow-decryptstepdetails-type
-	Type *string `json:"Type,omitempty"`
+	Type string `json:"Type"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go
index 0f56502c01..8ba4ce67c6 100644
--- a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_identitysourceconfiguration.go
@@ -11,9 +11,14 @@ import (
 type IdentitySource_IdentitySourceConfiguration struct {
 
 	// CognitoUserPoolConfiguration AWS CloudFormation Property
-	// Required: true
+	// Required: false
 	// 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"`
+	CognitoUserPoolConfiguration *IdentitySource_CognitoUserPoolConfiguration `json:"CognitoUserPoolConfiguration,omitempty"`
+
+	// OpenIdConnectConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-identitysourceconfiguration.html#cfn-verifiedpermissions-identitysource-identitysourceconfiguration-openidconnectconfiguration
+	OpenIdConnectConfiguration *IdentitySource_OpenIdConnectConfiguration `json:"OpenIdConnectConfiguration,omitempty"`
 
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectaccesstokenconfiguration.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectaccesstokenconfiguration.go
new file mode 100644
index 0000000000..76382cacaf
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectaccesstokenconfiguration.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_OpenIdConnectAccessTokenConfiguration AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectaccesstokenconfiguration.html
+type IdentitySource_OpenIdConnectAccessTokenConfiguration struct {
+
+	// Audiences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectaccesstokenconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectaccesstokenconfiguration-audiences
+	Audiences []string `json:"Audiences,omitempty"`
+
+	// PrincipalIdClaim AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectaccesstokenconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectaccesstokenconfiguration-principalidclaim
+	PrincipalIdClaim *string `json:"PrincipalIdClaim,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_OpenIdConnectAccessTokenConfiguration) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectconfiguration.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectconfiguration.go
new file mode 100644
index 0000000000..a4720d4742
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectconfiguration.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_OpenIdConnectConfiguration AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectconfiguration.html
+type IdentitySource_OpenIdConnectConfiguration struct {
+
+	// EntityIdPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectconfiguration-entityidprefix
+	EntityIdPrefix *string `json:"EntityIdPrefix,omitempty"`
+
+	// GroupConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectconfiguration-groupconfiguration
+	GroupConfiguration *IdentitySource_OpenIdConnectGroupConfiguration `json:"GroupConfiguration,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectconfiguration-issuer
+	Issuer string `json:"Issuer"`
+
+	// TokenSelection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectconfiguration-tokenselection
+	TokenSelection *IdentitySource_OpenIdConnectTokenSelection `json:"TokenSelection"`
+
+	// 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_OpenIdConnectConfiguration) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectgroupconfiguration.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectgroupconfiguration.go
new file mode 100644
index 0000000000..d876bea2de
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectgroupconfiguration.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_OpenIdConnectGroupConfiguration AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectgroupconfiguration.html
+type IdentitySource_OpenIdConnectGroupConfiguration struct {
+
+	// GroupClaim AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectgroupconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectgroupconfiguration-groupclaim
+	GroupClaim string `json:"GroupClaim"`
+
+	// GroupEntityType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectgroupconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectgroupconfiguration-groupentitytype
+	GroupEntityType string `json:"GroupEntityType"`
+
+	// 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_OpenIdConnectGroupConfiguration) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectidentitytokenconfiguration.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectidentitytokenconfiguration.go
new file mode 100644
index 0000000000..88c83f2638
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnectidentitytokenconfiguration.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_OpenIdConnectIdentityTokenConfiguration AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectidentitytokenconfiguration.html
+type IdentitySource_OpenIdConnectIdentityTokenConfiguration struct {
+
+	// ClientIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectidentitytokenconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectidentitytokenconfiguration-clientids
+	ClientIds []string `json:"ClientIds,omitempty"`
+
+	// PrincipalIdClaim AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnectidentitytokenconfiguration.html#cfn-verifiedpermissions-identitysource-openidconnectidentitytokenconfiguration-principalidclaim
+	PrincipalIdClaim *string `json:"PrincipalIdClaim,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_OpenIdConnectIdentityTokenConfiguration) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration"
+}
diff --git a/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnecttokenselection.go b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnecttokenselection.go
new file mode 100644
index 0000000000..f6553db955
--- /dev/null
+++ b/cloudformation/verifiedpermissions/aws-verifiedpermissions-identitysource_openidconnecttokenselection.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_OpenIdConnectTokenSelection AWS CloudFormation Resource (AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnecttokenselection.html
+type IdentitySource_OpenIdConnectTokenSelection struct {
+
+	// AccessTokenOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnecttokenselection.html#cfn-verifiedpermissions-identitysource-openidconnecttokenselection-accesstokenonly
+	AccessTokenOnly *IdentitySource_OpenIdConnectAccessTokenConfiguration `json:"AccessTokenOnly,omitempty"`
+
+	// IdentityTokenOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-verifiedpermissions-identitysource-openidconnecttokenselection.html#cfn-verifiedpermissions-identitysource-openidconnecttokenselection-identitytokenonly
+	IdentityTokenOnly *IdentitySource_OpenIdConnectIdentityTokenConfiguration `json:"IdentityTokenOnly,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_OpenIdConnectTokenSelection) AWSCloudFormationType() string {
+	return "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection"
+}
diff --git a/cloudformation/workspaces/aws-workspaces-workspacespool.go b/cloudformation/workspaces/aws-workspaces-workspacespool.go
new file mode 100644
index 0000000000..a37b4d9e7b
--- /dev/null
+++ b/cloudformation/workspaces/aws-workspaces-workspacespool.go
@@ -0,0 +1,153 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package workspaces
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
+)
+
+// WorkspacesPool AWS CloudFormation Resource (AWS::WorkSpaces::WorkspacesPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html
+type WorkspacesPool struct {
+
+	// ApplicationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-applicationsettings
+	ApplicationSettings *WorkspacesPool_ApplicationSettings `json:"ApplicationSettings,omitempty"`
+
+	// BundleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-bundleid
+	BundleId string `json:"BundleId"`
+
+	// Capacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-capacity
+	Capacity *WorkspacesPool_Capacity `json:"Capacity"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-description
+	Description *string `json:"Description,omitempty"`
+
+	// DirectoryId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-directoryid
+	DirectoryId string `json:"DirectoryId"`
+
+	// PoolName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-poolname
+	PoolName string `json:"PoolName"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// TimeoutSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspacespool.html#cfn-workspaces-workspacespool-timeoutsettings
+	TimeoutSettings *WorkspacesPool_TimeoutSettings `json:"TimeoutSettings,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 *WorkspacesPool) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::WorkspacesPool"
+}
+
+// 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 WorkspacesPool) MarshalJSON() ([]byte, error) {
+	type Properties WorkspacesPool
+	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 *WorkspacesPool) UnmarshalJSON(b []byte) error {
+	type Properties WorkspacesPool
+	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 = WorkspacesPool(*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/workspaces/aws-workspaces-workspacespool_applicationsettings.go b/cloudformation/workspaces/aws-workspaces-workspacespool_applicationsettings.go
new file mode 100644
index 0000000000..3a23fe95c1
--- /dev/null
+++ b/cloudformation/workspaces/aws-workspaces-workspacespool_applicationsettings.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package workspaces
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WorkspacesPool_ApplicationSettings AWS CloudFormation Resource (AWS::WorkSpaces::WorkspacesPool.ApplicationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-applicationsettings.html
+type WorkspacesPool_ApplicationSettings struct {
+
+	// SettingsGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-applicationsettings.html#cfn-workspaces-workspacespool-applicationsettings-settingsgroup
+	SettingsGroup *string `json:"SettingsGroup,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-applicationsettings.html#cfn-workspaces-workspacespool-applicationsettings-status
+	Status string `json:"Status"`
+
+	// 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 *WorkspacesPool_ApplicationSettings) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::WorkspacesPool.ApplicationSettings"
+}
diff --git a/cloudformation/workspaces/aws-workspaces-workspacespool_capacity.go b/cloudformation/workspaces/aws-workspaces-workspacespool_capacity.go
new file mode 100644
index 0000000000..9ec94c222e
--- /dev/null
+++ b/cloudformation/workspaces/aws-workspaces-workspacespool_capacity.go
@@ -0,0 +1,37 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package workspaces
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WorkspacesPool_Capacity AWS CloudFormation Resource (AWS::WorkSpaces::WorkspacesPool.Capacity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-capacity.html
+type WorkspacesPool_Capacity struct {
+
+	// DesiredUserSessions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-capacity.html#cfn-workspaces-workspacespool-capacity-desiredusersessions
+	DesiredUserSessions int `json:"DesiredUserSessions"`
+
+	// 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 *WorkspacesPool_Capacity) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::WorkspacesPool.Capacity"
+}
diff --git a/cloudformation/workspaces/aws-workspaces-workspacespool_timeoutsettings.go b/cloudformation/workspaces/aws-workspaces-workspacespool_timeoutsettings.go
new file mode 100644
index 0000000000..867262b021
--- /dev/null
+++ b/cloudformation/workspaces/aws-workspaces-workspacespool_timeoutsettings.go
@@ -0,0 +1,47 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package workspaces
+
+import (
+	"github.com/awslabs/goformation/v7/cloudformation/policies"
+)
+
+// WorkspacesPool_TimeoutSettings AWS CloudFormation Resource (AWS::WorkSpaces::WorkspacesPool.TimeoutSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-timeoutsettings.html
+type WorkspacesPool_TimeoutSettings struct {
+
+	// DisconnectTimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-timeoutsettings.html#cfn-workspaces-workspacespool-timeoutsettings-disconnecttimeoutinseconds
+	DisconnectTimeoutInSeconds *int `json:"DisconnectTimeoutInSeconds,omitempty"`
+
+	// IdleDisconnectTimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-timeoutsettings.html#cfn-workspaces-workspacespool-timeoutsettings-idledisconnecttimeoutinseconds
+	IdleDisconnectTimeoutInSeconds *int `json:"IdleDisconnectTimeoutInSeconds,omitempty"`
+
+	// MaxUserDurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspacespool-timeoutsettings.html#cfn-workspaces-workspacespool-timeoutsettings-maxuserdurationinseconds
+	MaxUserDurationInSeconds *int `json:"MaxUserDurationInSeconds,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 *WorkspacesPool_TimeoutSettings) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::WorkspacesPool.TimeoutSettings"
+}
diff --git a/cloudformation/workspacesthinclient/aws-workspacesthinclient-environment.go b/cloudformation/workspacesthinclient/aws-workspacesthinclient-environment.go
index 627b724fe7..3be3851378 100644
--- a/cloudformation/workspacesthinclient/aws-workspacesthinclient-environment.go
+++ b/cloudformation/workspacesthinclient/aws-workspacesthinclient-environment.go
@@ -29,6 +29,11 @@ type Environment struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesthinclient-environment.html#cfn-workspacesthinclient-environment-desktopendpoint
 	DesktopEndpoint *string `json:"DesktopEndpoint,omitempty"`
 
+	// DeviceCreationTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesthinclient-environment.html#cfn-workspacesthinclient-environment-devicecreationtags
+	DeviceCreationTags []tags.Tag `json:"DeviceCreationTags,omitempty"`
+
 	// KmsKeyArn AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesthinclient-environment.html#cfn-workspacesthinclient-environment-kmskeyarn
diff --git a/cloudformation/workspacesweb/aws-workspacesweb-identityprovider.go b/cloudformation/workspacesweb/aws-workspacesweb-identityprovider.go
index 41c5770695..5ca4f8bd3a 100644
--- a/cloudformation/workspacesweb/aws-workspacesweb-identityprovider.go
+++ b/cloudformation/workspacesweb/aws-workspacesweb-identityprovider.go
@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 
 	"github.com/awslabs/goformation/v7/cloudformation/policies"
+	"github.com/awslabs/goformation/v7/cloudformation/tags"
 )
 
 // IdentityProvider AWS CloudFormation Resource (AWS::WorkSpacesWeb::IdentityProvider)
@@ -33,6 +34,11 @@ type IdentityProvider struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-identityprovider.html#cfn-workspacesweb-identityprovider-portalarn
 	PortalArn *string `json:"PortalArn,omitempty"`
 
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-identityprovider.html#cfn-workspacesweb-identityprovider-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
 	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
 	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
 
diff --git a/cloudformation/workspacesweb/aws-workspacesweb-usersettings.go b/cloudformation/workspacesweb/aws-workspacesweb-usersettings.go
index 7c63761c0c..a960001915 100644
--- a/cloudformation/workspacesweb/aws-workspacesweb-usersettings.go
+++ b/cloudformation/workspacesweb/aws-workspacesweb-usersettings.go
@@ -34,6 +34,11 @@ type UserSettings struct {
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-usersettings.html#cfn-workspacesweb-usersettings-customermanagedkey
 	CustomerManagedKey *string `json:"CustomerManagedKey,omitempty"`
 
+	// DeepLinkAllowed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-usersettings.html#cfn-workspacesweb-usersettings-deeplinkallowed
+	DeepLinkAllowed *string `json:"DeepLinkAllowed,omitempty"`
+
 	// DisconnectTimeoutInMinutes AWS CloudFormation Property
 	// Required: false
 	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspacesweb-usersettings.html#cfn-workspacesweb-usersettings-disconnecttimeoutinminutes
diff --git a/schema/cdk.go b/schema/cdk.go
index 8fe7da028e..130531dd21 100644
--- a/schema/cdk.go
+++ b/schema/cdk.go
@@ -541,6 +541,9 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.CrlDistributionPointExtensionConfiguration": {
@@ -597,7 +600,6 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "NameAssigner",
                 "PartyName"
             ],
             "type": "object"
@@ -675,6 +677,9 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.OtherName": {
@@ -1232,6 +1237,71 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus": {
+            "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": {
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::ARCZonalShift::ZonalAutoshiftConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -1614,11 +1684,9 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "AutoMinorVersionUpgrade",
                         "BrokerName",
                         "DeploymentMode",
                         "EngineType",
-                        "EngineVersion",
                         "HostInstanceType",
                         "PubliclyAccessible",
                         "Users"
@@ -1867,7 +1935,6 @@ var CdkSchema = `{
                     "required": [
                         "Data",
                         "EngineType",
-                        "EngineVersion",
                         "Name"
                     ],
                     "type": "object"
@@ -2041,6 +2108,9 @@ var CdkSchema = `{
                         "BuildSpec": {
                             "type": "string"
                         },
+                        "CacheConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.CacheConfig"
+                        },
                         "CustomHeaders": {
                             "type": "string"
                         },
@@ -2170,6 +2240,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Amplify::App.CacheConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Amplify::App.CustomRule": {
             "additionalProperties": false,
             "properties": {
@@ -6489,12 +6568,30 @@ var CdkSchema = `{
                             "type": "string"
                         },
                         "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "RequestTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "ResponseParameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameterMap"
+                                }
+                            },
                             "type": "object"
                         },
                         "TemplateSelectionExpression": {
@@ -6544,13 +6641,9 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "Destination",
-                "Source"
-            ],
             "type": "object"
         },
-        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+        "AWS::ApiGatewayV2::Integration.ResponseParameterMap": {
             "additionalProperties": false,
             "properties": {
                 "ResponseParameters": {
@@ -10105,7 +10198,8 @@ var CdkSchema = `{
                     "required": [
                         "ApplicationSourceConfig",
                         "Description",
-                        "Name"
+                        "Name",
+                        "Namespace"
                     ],
                     "type": "object"
                 },
@@ -16546,7 +16640,7 @@ var CdkSchema = `{
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget": {
+        "AWS::AppTest::TestCase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -16581,46 +16675,37 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MaxCapacity": {
-                            "type": "number"
-                        },
-                        "MinCapacity": {
-                            "type": "number"
-                        },
-                        "ResourceId": {
-                            "type": "string"
-                        },
-                        "RoleARN": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ScalableDimension": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ScheduledActions": {
+                        "Steps": {
                             "items": {
-                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                                "$ref": "#/definitions/AWS::AppTest::TestCase.Step"
                             },
                             "type": "array"
                         },
-                        "ServiceNamespace": {
-                            "type": "string"
-                        },
-                        "SuspendedState": {
-                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MaxCapacity",
-                        "MinCapacity",
-                        "ResourceId",
-                        "ScalableDimension",
-                        "ServiceNamespace"
+                        "Name",
+                        "Steps"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                        "AWS::AppTest::TestCase"
                     ],
                     "type": "string"
                 },
@@ -16639,62 +16724,542 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+        "AWS::AppTest::TestCase.Batch": {
             "additionalProperties": false,
             "properties": {
-                "MaxCapacity": {
-                    "type": "number"
+                "BatchJobName": {
+                    "type": "string"
                 },
-                "MinCapacity": {
-                    "type": "number"
+                "BatchJobParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "BatchJobName"
+            ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+        "AWS::AppTest::TestCase.CloudFormationAction": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
+                "ActionType": {
                     "type": "string"
                 },
-                "ScalableTargetAction": {
-                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.CompareAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Input"
                 },
-                "Schedule": {
+                "Output": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Output"
+                }
+            },
+            "required": [
+                "Input"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ccsid": {
                     "type": "string"
                 },
-                "ScheduledActionName": {
+                "Format": {
                     "type": "string"
                 },
-                "StartTime": {
+                "Length": {
+                    "type": "number"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Timezone": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Schedule",
-                "ScheduledActionName"
+                "Ccsid",
+                "Format",
+                "Length",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+        "AWS::AppTest::TestCase.DatabaseCDC": {
             "additionalProperties": false,
             "properties": {
-                "DynamicScalingInSuspended": {
-                    "type": "boolean"
+                "SourceMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.SourceDatabaseMetadata"
                 },
-                "DynamicScalingOutSuspended": {
-                    "type": "boolean"
+                "TargetMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TargetDatabaseMetadata"
+                }
+            },
+            "required": [
+                "SourceMetadata",
+                "TargetMetadata"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.FileMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppTest::TestCase.DataSet"
+                    },
+                    "type": "array"
                 },
-                "ScheduledScalingSuspended": {
+                "DatabaseCDC": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.DatabaseCDC"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.InputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.InputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.FileMetadata"
+                },
+                "SourceLocation": {
+                    "type": "string"
+                },
+                "TargetLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileMetadata",
+                "SourceLocation",
+                "TargetLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2ManagedActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ForceStop": {
                     "type": "boolean"
+                },
+                "ImportDataSetLocation": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalingPolicy": {
+        "AWS::AppTest::TestCase.M2ManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2NonManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionType"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DmsTaskArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Batch": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Batch"
+                },
+                "Tn3270": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TN3270"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.OutputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.OutputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.ResourceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CloudFormationAction"
+                },
+                "M2ManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedApplicationAction"
+                },
+                "M2NonManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2NonManagedApplicationAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Script": {
+            "additionalProperties": false,
+            "properties": {
+                "ScriptLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScriptLocation",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.SourceDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Step": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.StepAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.StepAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CompareAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CompareAction"
+                },
+                "MainframeAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeAction"
+                },
+                "ResourceAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.ResourceAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TN3270": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Script": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Script"
+                }
+            },
+            "required": [
+                "Script"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TargetDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TestCaseLatestVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Status",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "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": {
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MinCapacity": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScheduledActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "SuspendedState": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        }
+                    },
+                    "required": [
+                        "MaxCapacity",
+                        "MinCapacity",
+                        "ResourceId",
+                        "ScalableDimension",
+                        "ServiceNamespace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "ScalableTargetAction": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                },
+                "Schedule": {
+                    "type": "string"
+                },
+                "ScheduledActionName": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule",
+                "ScheduledActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicScalingInSuspended": {
+                    "type": "boolean"
+                },
+                "DynamicScalingOutSuspended": {
+                    "type": "boolean"
+                },
+                "ScheduledScalingSuspended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17467,7 +18032,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation": {
+        "AWS::ApplicationSignals::ServiceLevelObjective": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17502,31 +18067,36 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CapacityAssignmentConfiguration": {
-                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Goal": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Goal"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "RequestBasedSli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli"
+                        },
+                        "Sli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Sli"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TargetDpus": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "Name",
-                        "TargetDpus"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Athena::CapacityReservation"
+                        "AWS::ApplicationSignals::ServiceLevelObjective"
                     ],
                     "type": "string"
                 },
@@ -17545,37 +18115,378 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval": {
             "additionalProperties": false,
             "properties": {
-                "WorkgroupNames": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Duration",
+                "DurationUnit",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Goal": {
+            "additionalProperties": false,
+            "properties": {
+                "AttainmentGoal": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Interval"
+                },
+                "WarningThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Interval": {
+            "additionalProperties": false,
+            "properties": {
+                "CalendarInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval"
+                },
+                "RollingInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Dimension"
                     },
                     "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "WorkgroupNames"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricStat": {
             "additionalProperties": false,
             "properties": {
-                "CapacityAssignments": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "BadCountMetric": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "GoodCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "RequestBasedSliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric"
+                }
+            },
+            "required": [
+                "RequestBasedSliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "MonitoredRequestCountMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "TotalRequestCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
                     },
                     "type": "array"
                 }
             },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                }
+            },
             "required": [
-                "CapacityAssignments"
+                "Duration",
+                "DurationUnit"
             ],
             "type": "object"
         },
-        "AWS::Athena::DataCatalog": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.Sli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "SliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.SliMetric"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricThreshold",
+                "SliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.SliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "PeriodSeconds": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation": {
+            "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": {
+                        "CapacityAssignmentConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetDpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetDpus"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkgroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WorkgroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityAssignments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CapacityAssignments"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -19184,6 +20095,12 @@ var CdkSchema = `{
                 "MetricName": {
                     "type": "string"
                 },
+                "Metrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery"
+                    },
+                    "type": "array"
+                },
                 "Namespace": {
                     "type": "string"
                 },
@@ -19194,11 +20111,6 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "MetricName",
-                "Namespace",
-                "Statistic"
-            ],
             "type": "object"
         },
         "AWS::AutoScaling::ScalingPolicy.Metric": {
@@ -19483,179 +20395,222 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::ScheduledAction": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Id": {
                     "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "DesiredCapacity": {
-                            "type": "number"
-                        },
-                        "EndTime": {
-                            "type": "string"
-                        },
-                        "MaxSize": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "Recurrence": {
-                            "type": "string"
-                        },
-                        "StartTime": {
-                            "type": "string"
-                        },
-                        "TimeZone": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::ScheduledAction"
-                    ],
+                "Label": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat": {
             "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "InstanceReusePolicy": {
-                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
-                        },
-                        "MaxGroupPreparedCapacity": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "PoolState": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
+                "Metric": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.Metric"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::WarmPool"
-                    ],
+                "Stat": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Metric",
+                "Stat"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "ReuseOnScaleIn": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::AutoScalingPlans::ScalingPlan": {
+        "AWS::AutoScaling::ScheduledAction": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "number"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Recurrence": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "InstanceReusePolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
+                        },
+                        "MaxGroupPreparedCapacity": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "PoolState": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::WarmPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ReuseOnScaleIn": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20053,6 +21008,9 @@ var CdkSchema = `{
         "AWS::B2BI::Capability.EdiConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CapabilityDirection": {
+                    "type": "string"
+                },
                 "InputLocation": {
                     "$ref": "#/definitions/AWS::B2BI::Capability.S3Location"
                 },
@@ -20151,6 +21109,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "CapabilityOptions": {
+                            "$ref": "#/definitions/AWS::B2BI::Partnership.CapabilityOptions"
+                        },
                         "Email": {
                             "type": "string"
                         },
@@ -20171,6 +21132,7 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
+                        "Capabilities",
                         "Email",
                         "Name",
                         "ProfileId"
@@ -20198,93 +21160,112 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::B2BI::Profile": {
+        "AWS::B2BI::Partnership.CapabilityOptions": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "OutboundEdi": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.OutboundEdiOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.OutboundEdiOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "X12": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Envelope"
+                }
+            },
+            "required": [
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Delimiters": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentSeparator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DataElementSeparator": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "SegmentTerminator": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Envelope": {
+            "additionalProperties": false,
+            "properties": {
+                "Common": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12OutboundEdiHeaders"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12FunctionalGroupHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationReceiverCode": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "ApplicationSenderCode": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "BusinessName": {
-                            "type": "string"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "Logging": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Phone": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "BusinessName",
-                        "Logging",
-                        "Name",
-                        "Phone"
-                    ],
-                    "type": "object"
+                "ResponsibleAgencyCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12InterchangeControlHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "AcknowledgmentRequestedCode": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::B2BI::Profile"
-                    ],
+                "ReceiverId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ReceiverIdQualifier": {
+                    "type": "string"
+                },
+                "RepetitionSeparator": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "SenderIdQualifier": {
+                    "type": "string"
+                },
+                "UsageIndicatorCode": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer": {
+        "AWS::B2BI::Partnership.X12OutboundEdiHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiters": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Delimiters"
+                },
+                "FunctionalGroupHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12FunctionalGroupHeaders"
+                },
+                "InterchangeControlHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12InterchangeControlHeaders"
+                },
+                "ValidateEdi": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Profile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20319,21 +21300,107 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EdiType": {
-                            "$ref": "#/definitions/AWS::B2BI::Transformer.EdiType"
+                        "BusinessName": {
+                            "type": "string"
                         },
-                        "FileFormat": {
+                        "Email": {
                             "type": "string"
                         },
-                        "MappingTemplate": {
+                        "Logging": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "SampleDocument": {
+                        "Phone": {
                             "type": "string"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BusinessName",
+                        "Logging",
+                        "Name",
+                        "Phone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::B2BI::Profile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer": {
+            "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": {
+                        "InputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.InputConversion"
+                        },
+                        "Mapping": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.Mapping"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.OutputConversion"
+                        },
+                        "SampleDocuments": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocuments"
+                        },
                         "Status": {
                             "type": "string"
                         },
@@ -20345,9 +21412,6 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "EdiType",
-                        "FileFormat",
-                        "MappingTemplate",
                         "Name",
                         "Status"
                     ],
@@ -20374,15 +21438,91 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer.EdiType": {
+        "AWS::B2BI::Transformer.FormatOptions": {
             "additionalProperties": false,
             "properties": {
-                "X12Details": {
+                "X12": {
                     "$ref": "#/definitions/AWS::B2BI::Transformer.X12Details"
                 }
             },
             "required": [
-                "X12Details"
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.InputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "FromFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FromFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.Mapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Template": {
+                    "type": "string"
+                },
+                "TemplateLanguage": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateLanguage"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.OutputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "ToFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ToFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocumentKeys": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Output": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Keys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocumentKeys"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Keys"
             ],
             "type": "object"
         },
@@ -21413,6 +22553,9 @@ var CdkSchema = `{
                         "ScheduleExpressionTimezone": {
                             "type": "string"
                         },
+                        "ScheduleStatus": {
+                            "type": "string"
+                        },
                         "StartWindowHours": {
                             "type": "number"
                         },
@@ -21741,6 +22884,9 @@ var CdkSchema = `{
                         "ComputeResources": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
                         },
+                        "Context": {
+                            "type": "string"
+                        },
                         "EksConfiguration": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.EksConfiguration"
                         },
@@ -22618,6 +23764,9 @@ var CdkSchema = `{
                 "EcsProperties": {
                     "$ref": "#/definitions/AWS::Batch::JobDefinition.EcsProperties"
                 },
+                "EksProperties": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EksProperties"
+                },
                 "InstanceTypes": {
                     "items": {
                         "type": "string"
@@ -23212,6 +24361,9 @@ var CdkSchema = `{
                         "FoundationModel": {
                             "type": "string"
                         },
+                        "GuardrailConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.GuardrailConfiguration"
+                        },
                         "IdleSessionTTLInSeconds": {
                             "type": "number"
                         },
@@ -23290,13 +24442,13 @@ var CdkSchema = `{
         "AWS::Bedrock::Agent.ActionGroupExecutor": {
             "additionalProperties": false,
             "properties": {
+                "CustomControl": {
+                    "type": "string"
+                },
                 "Lambda": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Lambda"
-            ],
             "type": "object"
         },
         "AWS::Bedrock::Agent.AgentActionGroup": {
@@ -23317,6 +24469,9 @@ var CdkSchema = `{
                 "Description": {
                     "type": "string"
                 },
+                "FunctionSchema": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.FunctionSchema"
+                },
                 "ParentActionGroupSignature": {
                     "type": "string"
                 },
@@ -23348,367 +24503,154 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.InferenceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumLength": {
-                    "type": "number"
-                },
-                "StopSequences": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Temperature": {
-                    "type": "number"
-                },
-                "TopK": {
-                    "type": "number"
-                },
-                "TopP": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Agent.PromptConfiguration": {
+        "AWS::Bedrock::Agent.Function": {
             "additionalProperties": false,
             "properties": {
-                "BasePromptTemplate": {
-                    "type": "string"
-                },
-                "InferenceConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
-                },
-                "ParserMode": {
-                    "type": "string"
-                },
-                "PromptCreationMode": {
+                "Description": {
                     "type": "string"
                 },
-                "PromptState": {
+                "Name": {
                     "type": "string"
                 },
-                "PromptType": {
-                    "type": "string"
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.ParameterDetail"
+                        }
+                    },
+                    "type": "object"
                 }
             },
+            "required": [
+                "Name"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
+        "AWS::Bedrock::Agent.FunctionSchema": {
             "additionalProperties": false,
             "properties": {
-                "OverrideLambda": {
-                    "type": "string"
-                },
-                "PromptConfigurations": {
+                "Functions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.Function"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PromptConfigurations"
+                "Functions"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.S3Identifier": {
+        "AWS::Bedrock::Agent.GuardrailConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "S3BucketName": {
+                "GuardrailIdentifier": {
                     "type": "string"
                 },
-                "S3ObjectKey": {
+                "GuardrailVersion": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias": {
+        "AWS::Bedrock::Agent.InferenceConfiguration": {
             "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"
+                "MaximumLength": {
+                    "type": "number"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "AgentAliasName": {
-                            "type": "string"
-                        },
-                        "AgentId": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "RoutingConfiguration": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "AgentAliasName",
-                        "AgentId"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::AgentAlias"
-                    ],
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+        "AWS::Bedrock::Agent.ParameterDetail": {
             "additionalProperties": false,
             "properties": {
-                "EndDate": {
+                "Description": {
                     "type": "string"
                 },
-                "RoutingConfiguration": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                    },
-                    "type": "array"
+                "Required": {
+                    "type": "boolean"
                 },
-                "StartDate": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
-            "additionalProperties": false,
-            "properties": {
-                "AgentVersion": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "AgentVersion"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource": {
+        "AWS::Bedrock::Agent.PromptConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "BasePromptTemplate": {
                     "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": {
-                        "DataSourceConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "KnowledgeBaseId": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ServerSideEncryptionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
-                        },
-                        "VectorIngestionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
-                        }
-                    },
-                    "required": [
-                        "DataSourceConfiguration",
-                        "KnowledgeBaseId",
-                        "Name"
-                    ],
-                    "type": "object"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::DataSource"
-                    ],
+                "ParserMode": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingStrategy": {
+                "PromptCreationMode": {
                     "type": "string"
                 },
-                "FixedSizeChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
-                }
-            },
-            "required": [
-                "ChunkingStrategy"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3Configuration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
-                },
-                "Type": {
+                "PromptState": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "S3Configuration",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxTokens": {
-                    "type": "number"
                 },
-                "OverlapPercentage": {
-                    "type": "number"
+                "PromptType": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "MaxTokens",
-                "OverlapPercentage"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BucketArn": {
+                "OverrideLambda": {
                     "type": "string"
                 },
-                "InclusionPrefixes": {
+                "PromptConfigurations": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "BucketArn"
+                "PromptConfigurations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+        "AWS::Bedrock::Agent.S3Identifier": {
             "additionalProperties": false,
             "properties": {
-                "KmsKeyArn": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectKey": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Guardrail": {
+        "AWS::Bedrock::AgentAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -23743,50 +24685,155 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BlockedInputMessaging": {
+                        "AgentAliasName": {
                             "type": "string"
                         },
-                        "BlockedOutputsMessaging": {
+                        "AgentId": {
                             "type": "string"
                         },
-                        "ContentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
-                            "type": "string"
+                        "RoutingConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                            },
+                            "type": "array"
                         },
-                        "Name": {
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AgentAliasName",
+                        "AgentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Bedrock::AgentAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EndDate": {
+                    "type": "string"
+                },
+                "RoutingConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                    },
+                    "type": "array"
+                },
+                "StartDate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SensitiveInformationPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
-                        },
-                        "Tags": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDeletionPolicy": {
+                            "type": "string"
                         },
-                        "TopicPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
                         },
-                        "WordPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KnowledgeBaseId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
+                        },
+                        "VectorIngestionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
                         }
                     },
                     "required": [
-                        "BlockedInputMessaging",
-                        "BlockedOutputsMessaging",
+                        "DataSourceConfiguration",
+                        "KnowledgeBaseId",
                         "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::Guardrail"
+                        "AWS::Bedrock::DataSource"
                     ],
                     "type": "string"
                 },
@@ -23805,46 +24852,144 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
+        "AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "InputStrength": {
+                "ModelArn": {
                     "type": "string"
                 },
-                "OutputStrength": {
+                "ParsingPrompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingPrompt"
+                }
+            },
+            "required": [
+                "ModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingStrategy": {
+                    "type": "string"
+                },
+                "FixedSizeChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
+                },
+                "HierarchicalChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration"
+                },
+                "SemanticChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SemanticChunkingConfiguration"
+                }
+            },
+            "required": [
+                "ChunkingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
+                "HostType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostType",
+                "HostUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.CrawlFilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PatternObjectFilter": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilterConfiguration"
+                },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InputStrength",
-                "OutputStrength",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
+        "AWS::Bedrock::DataSource.CustomTransformationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FiltersConfig": {
+                "IntermediateStorage": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.IntermediateStorage"
+                },
+                "Transformations": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.Transformation"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "FiltersConfig"
+                "IntermediateStorage",
+                "Transformations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointDataSourceConfiguration"
+                },
                 "Type": {
                     "type": "string"
+                },
+                "WebConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebDataSourceConfiguration"
                 }
             },
             "required": [
@@ -23852,135 +24997,438 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "Type": {
-                    "type": "string"
+                "OverlapPercentage": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Action",
-                "Type"
+                "MaxTokens",
+                "OverlapPercentage"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.RegexConfig": {
+        "AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "LevelConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration"
+                    },
+                    "type": "array"
                 },
-                "Description": {
-                    "type": "string"
+                "OverlapTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LevelConfigurations",
+                "OverlapTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.IntermediateStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockFoundationModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration"
                 },
-                "Name": {
+                "ParsingStrategy": {
                     "type": "string"
-                },
-                "Pattern": {
+                }
+            },
+            "required": [
+                "ParsingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingPrompt": {
+            "additionalProperties": false,
+            "properties": {
+                "ParsingPromptText": {
                     "type": "string"
                 }
             },
             "required": [
-                "Action",
-                "Name",
-                "Pattern"
+                "ParsingPromptText"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilter": {
             "additionalProperties": false,
             "properties": {
-                "PiiEntitiesConfig": {
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "RegexesConfig": {
+                "InclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "ObjectType": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ObjectType"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilterConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Definition": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Filters"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
                     "type": "string"
                 },
-                "Examples": {
+                "BucketOwnerAccountId": {
+                    "type": "string"
+                },
+                "InclusionPrefixes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "BucketArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "URI"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration"
                 },
-                "Name": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
                     "type": "string"
                 },
-                "Type": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "HostUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Definition",
-                "Name",
-                "Type"
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostUrl"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
+        "AWS::Bedrock::DataSource.SeedUrl": {
             "additionalProperties": false,
             "properties": {
-                "TopicsConfig": {
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SemanticChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BreakpointPercentileThreshold": {
+                    "type": "number"
+                },
+                "BufferSize": {
+                    "type": "number"
+                },
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BreakpointPercentileThreshold",
+                "BufferSize",
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                },
+                "HostType": {
+                    "type": "string"
+                },
+                "SiteUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "TenantId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TopicsConfig"
+                "AuthType",
+                "CredentialsSecretArn",
+                "Domain",
+                "HostType",
+                "SiteUrls"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordConfig": {
+        "AWS::Bedrock::DataSource.Transformation": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
+                "StepToApply": {
                     "type": "string"
+                },
+                "TransformationFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationFunction"
                 }
             },
             "required": [
-                "Text"
+                "StepToApply",
+                "TransformationFunction"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+        "AWS::Bedrock::DataSource.TransformationFunction": {
             "additionalProperties": false,
             "properties": {
-                "ManagedWordListsConfig": {
+                "TransformationLambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationLambdaConfiguration"
+                }
+            },
+            "required": [
+                "TransformationLambdaConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.TransformationLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.UrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.SeedUrl"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
                 },
-                "WordsConfig": {
+                "CustomTransformationConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CustomTransformationConfiguration"
+                },
+                "ParsingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerLimits": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerLimits"
+                },
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionFilters": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "Scope": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase": {
+        "AWS::Bedrock::DataSource.WebCrawlerLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "UrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.UrlConfiguration"
+                }
+            },
+            "required": [
+                "UrlConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24015,20 +25463,35 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "KnowledgeBaseConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDefinition"
                         },
-                        "Name": {
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.S3Location"
+                        },
+                        "DefinitionString": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StorageConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
                         },
                         "Tags": {
                             "additionalProperties": true,
@@ -24038,19 +25501,26 @@ var CdkSchema = `{
                                 }
                             },
                             "type": "object"
+                        },
+                        "TestAliasTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "KnowledgeBaseConfiguration",
-                        "Name",
-                        "RoleArn",
-                        "StorageConfiguration"
+                        "ExecutionRoleArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::KnowledgeBase"
+                        "AWS::Bedrock::Flow"
                     ],
                     "type": "string"
                 },
@@ -24069,187 +25539,517 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "AgentAliasArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.ConditionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
                     "type": "string"
                 },
-                "VectorKnowledgeBaseConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                "Name": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "VectorKnowledgeBaseConfiguration"
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+        "AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CollectionArn": {
+                "Condition": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnectionConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                "Name": {
+                    "type": "string"
                 },
-                "VectorIndexName": {
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "CollectionArn",
-                "FieldMapping",
-                "VectorIndexName"
+                "Name",
+                "Source",
+                "Target",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+        "AWS::Bedrock::Flow.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
-                    "type": "string"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration"
                 },
-                "TextField": {
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
                     "type": "string"
                 },
-                "VectorField": {
+                "TargetInput": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField",
-                "VectorField"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+        "AWS::Bedrock::Flow.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionString": {
+                "Connections": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnection"
+                    },
+                    "type": "array"
+                },
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNode"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeConfiguration"
+                },
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "CredentialsSecretArn": {
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeOutput"
+                    },
+                    "type": "array"
+                },
+                "Type": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.AgentFlowNodeConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                "Collector": {
+                    "type": "object"
                 },
-                "Namespace": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.ConditionFlowNodeConfiguration"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Iterator": {
+                    "type": "object"
+                },
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration"
+                },
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "ConnectionString",
-                "CredentialsSecretArn",
-                "FieldMapping"
+                "Expression",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+        "AWS::Bedrock::Flow.FlowNodeOutput": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "Name": {
                     "type": "string"
                 },
-                "TextField": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+        "AWS::Bedrock::Flow.FlowValidation": {
             "additionalProperties": false,
             "properties": {
-                "CredentialsSecretArn": {
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
                     "type": "string"
                 },
-                "DatabaseName": {
+                "ModelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LexFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                "LocaleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BotAliasArn",
+                "LocaleId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInferenceConfiguration"
                 },
-                "ResourceArn": {
+                "ModelId": {
                     "type": "string"
                 },
-                "TableName": {
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "CredentialsSecretArn",
-                "DatabaseName",
-                "FieldMapping",
-                "ResourceArn",
-                "TableName"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+        "AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "PromptArn": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration"
                 },
-                "PrimaryKeyField": {
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "TextField": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "VectorField": {
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "PrimaryKeyField",
-                "TextField",
-                "VectorField"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+        "AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "OpensearchServerlessConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
-                },
-                "PineconeConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
                 },
-                "RdsConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "Type": {
+                "Version": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.StorageFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "EmbeddingModelArn": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.StorageFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "EmbeddingModelArn"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup": {
+        "AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24284,39 +26084,41 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountGrouping": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
-                        },
-                        "ComputationPreference": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
                         },
-                        "PrimaryAccountId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "RoutingConfiguration": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "AccountGrouping",
-                        "ComputationPreference",
+                        "FlowArn",
                         "Name",
-                        "PrimaryAccountId"
+                        "RoutingConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::BillingGroup"
+                        "AWS::Bedrock::FlowAlias"
                     ],
                     "type": "string"
                 },
@@ -24335,37 +26137,16 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoAssociate": {
-                    "type": "boolean"
-                },
-                "LinkedAccountIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "LinkedAccountIds"
-            ],
-            "type": "object"
-        },
-        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+        "AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem": {
             "additionalProperties": false,
             "properties": {
-                "PricingPlanArn": {
+                "FlowVersion": {
                     "type": "string"
                 }
             },
-            "required": [
-                "PricingPlanArn"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem": {
+        "AWS::Bedrock::FlowVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24400,40 +26181,21 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountId": {
-                            "type": "string"
-                        },
-                        "BillingGroupArn": {
-                            "type": "string"
-                        },
-                        "BillingPeriodRange": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
-                        },
-                        "CustomLineItemChargeDetails": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
                     "required": [
-                        "BillingGroupArn",
-                        "Name"
+                        "FlowArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::CustomLineItem"
+                        "AWS::Bedrock::FlowVersion"
                     ],
                     "type": "string"
                 },
@@ -24452,557 +26214,486 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+        "AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ExclusiveEndBillingPeriod": {
-                    "type": "string"
-                },
-                "InclusiveStartBillingPeriod": {
+                "AgentAliasArn": {
                     "type": "string"
                 }
             },
-            "type": "object"
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+        "AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Flat": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
-                },
-                "LineItemFilters": {
+                "Conditions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowCondition"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
                 },
-                "Percentage": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnectionConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
                 },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
+                "Name",
+                "Source",
+                "Target",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ChargeValue": {
-                    "type": "number"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration"
+                },
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
+                    "type": "string"
+                },
+                "TargetInput": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ChargeValue"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ChildAssociatedResources": {
+                "Connections": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnection"
                     },
                     "type": "array"
                 },
-                "PercentageValue": {
-                    "type": "number"
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNode"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "PercentageValue"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+        "AWS::Bedrock::FlowVersion.FlowNode": {
             "additionalProperties": false,
             "properties": {
-                "Attribute": {
-                    "type": "string"
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeConfiguration"
                 },
-                "MatchOption": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Values": {
+                "Outputs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeOutput"
                     },
                     "type": "array"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Attribute",
-                "MatchOption",
-                "Values"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingPlan": {
+        "AWS::Bedrock::FlowVersion.FlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Collector": {
+                    "type": "object"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration"
                 },
-                "Metadata": {
+                "Input": {
                     "type": "object"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "PricingRuleArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name"
-                    ],
+                "Iterator": {
                     "type": "object"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingPlan"
-                    ],
-                    "type": "string"
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule": {
+        "AWS::Bedrock::FlowVersion.FlowNodeInput": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Name": {
                     "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": {
-                        "BillingEntity": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ModifierPercentage": {
-                            "type": "number"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Operation": {
-                            "type": "string"
-                        },
-                        "Scope": {
-                            "type": "string"
-                        },
-                        "Service": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Tiering": {
-                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "UsageType": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "Scope",
-                        "Type"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingRule"
-                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowNodeOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.FreeTier": {
+        "AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Activated": {
-                    "type": "boolean"
+                "KnowledgeBaseId": {
+                    "type": "string"
+                },
+                "ModelId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Activated"
+                "KnowledgeBaseId"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.Tiering": {
+        "AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FreeTier": {
-                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
+                "LambdaArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "LambdaArn"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::Budget": {
+        "AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration": {
             "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": {
-                        "Budget": {
-                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
-                        },
-                        "NotificationsWithSubscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Budget"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Budgets::Budget"
-                    ],
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "LocaleId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "BotAliasArn",
+                "LocaleId"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.AutoAdjustData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustType": {
-                    "type": "string"
-                },
-                "HistoricalOptions": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration"
                 }
             },
             "required": [
-                "AutoAdjustType"
+                "SourceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.BudgetData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustData": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
-                },
-                "BudgetLimit": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
-                },
-                "BudgetName": {
-                    "type": "string"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInferenceConfiguration"
                 },
-                "BudgetType": {
+                "ModelId": {
                     "type": "string"
                 },
-                "CostFilters": {
-                    "type": "object"
-                },
-                "CostTypes": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
-                },
-                "PlannedBudgetLimits": {
-                    "type": "object"
-                },
-                "TimePeriod": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptTemplateConfiguration"
                 },
-                "TimeUnit": {
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "BudgetType",
-                "TimeUnit"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.CostTypes": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "IncludeCredit": {
-                    "type": "boolean"
-                },
-                "IncludeDiscount": {
-                    "type": "boolean"
-                },
-                "IncludeOtherSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeRecurring": {
-                    "type": "boolean"
-                },
-                "IncludeRefund": {
-                    "type": "boolean"
-                },
-                "IncludeSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeSupport": {
-                    "type": "boolean"
-                },
-                "IncludeTax": {
-                    "type": "boolean"
-                },
-                "IncludeUpfront": {
-                    "type": "boolean"
-                },
-                "UseAmortized": {
-                    "type": "boolean"
+                "PromptArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration"
                 },
-                "UseBlended": {
-                    "type": "boolean"
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration"
                 }
             },
             "type": "object"
         },
-        "AWS::Budgets::Budget.HistoricalOptions": {
+        "AWS::Bedrock::FlowVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BudgetAdjustmentPeriod": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "BudgetAdjustmentPeriod"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Notification": {
+        "AWS::Bedrock::FlowVersion.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "ComparisonOperator": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "NotificationType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Threshold": {
+                "Temperature": {
                     "type": "number"
                 },
-                "ThresholdType": {
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ComparisonOperator",
-                "NotificationType",
-                "Threshold"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Notification": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
-                },
-                "Subscribers": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
-                    },
-                    "type": "array"
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Notification",
-                "Subscribers"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Spend": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Amount": {
-                    "type": "number"
-                },
-                "Unit": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Amount",
-                "Unit"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Subscriber": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "SubscriptionType": {
-                    "type": "string"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Address",
-                "SubscriptionType"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.TimePeriod": {
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "End": {
+                "BucketName": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInputVariable"
+                    },
+                    "type": "array"
                 },
-                "Start": {
+                "Text": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Text"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction": {
+        "AWS::Bedrock::Guardrail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25037,48 +26728,53 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionThreshold": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
-                        },
-                        "ActionType": {
+                        "BlockedInputMessaging": {
                             "type": "string"
                         },
-                        "ApprovalModel": {
+                        "BlockedOutputsMessaging": {
                             "type": "string"
                         },
-                        "BudgetName": {
-                            "type": "string"
+                        "ContentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
                         },
-                        "Definition": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        "ContextualGroundingPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig"
                         },
-                        "ExecutionRoleArn": {
+                        "Description": {
                             "type": "string"
                         },
-                        "NotificationType": {
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Subscribers": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SensitiveInformationPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
+                        },
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TopicPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        },
+                        "WordPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
                         }
                     },
                     "required": [
-                        "ActionThreshold",
-                        "ActionType",
-                        "BudgetName",
-                        "Definition",
-                        "ExecutionRoleArn",
-                        "NotificationType",
-                        "Subscribers"
+                        "BlockedInputMessaging",
+                        "BlockedOutputsMessaging",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Budgets::BudgetsAction"
+                        "AWS::Bedrock::Guardrail"
                     ],
                     "type": "string"
                 },
@@ -25097,126 +26793,213 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "InputStrength": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "number"
+                "OutputStrength": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Value"
+                "InputStrength",
+                "OutputStrength",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Definition": {
+        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "IamActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
-                },
-                "ScpActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                "FiltersConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FiltersConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Threshold": {
+                    "type": "number"
                 },
-                "SsmActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "Threshold",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Groups": {
+                "FiltersConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "FiltersConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
                 },
-                "PolicyArn": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.RegexConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
                     "type": "string"
                 },
-                "Roles": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PiiEntitiesConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
                     },
                     "type": "array"
                 },
-                "Users": {
+                "RegexesConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
                     },
                     "type": "array"
                 }
             },
-            "required": [
-                "PolicyArn"
-            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+        "AWS::Bedrock::Guardrail.TopicConfig": {
             "additionalProperties": false,
             "properties": {
-                "PolicyId": {
+                "Definition": {
                     "type": "string"
                 },
-                "TargetIds": {
+                "Examples": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "PolicyId",
-                "TargetIds"
+                "Definition",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceIds": {
+                "TopicsConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
                     },
                     "type": "array"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "Subtype": {
-                    "type": "string"
                 }
             },
             "required": [
-                "InstanceIds",
-                "Region",
-                "Subtype"
+                "TopicsConfig"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Subscriber": {
+        "AWS::Bedrock::Guardrail.WordConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "Type": {
+                "Text": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::CDK::Metadata": {
+        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ManagedWordListsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                    },
+                    "type": "array"
+                },
+                "WordsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::GuardrailVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25251,15 +27034,21 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Analytics": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GuardrailIdentifier": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "GuardrailIdentifier"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CDK::Metadata"
+                        "AWS::Bedrock::GuardrailVersion"
                     ],
                     "type": "string"
                 },
@@ -25273,11 +27062,12 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor": {
+        "AWS::Bedrock::KnowledgeBase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25312,34 +27102,42 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MonitorDimension": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MonitorName": {
-                            "type": "string"
+                        "KnowledgeBaseConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
                         },
-                        "MonitorSpecification": {
+                        "Name": {
                             "type": "string"
                         },
-                        "MonitorType": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
+                        "StorageConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
                             },
-                            "type": "array"
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MonitorName",
-                        "MonitorType"
+                        "KnowledgeBaseConfiguration",
+                        "Name",
+                        "RoleArn",
+                        "StorageConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CE::AnomalyMonitor"
+                        "AWS::Bedrock::KnowledgeBase"
                     ],
                     "type": "string"
                 },
@@ -25358,405 +27156,242 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor.ResourceTag": {
+        "AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "Dimensions": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockEmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "string"
+                "VectorKnowledgeBaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Type",
+                "VectorKnowledgeBaseConfiguration"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription": {
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "CollectionName": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "Endpoint": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Frequency": {
-                            "type": "string"
-                        },
-                        "MonitorArnList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
-                            },
-                            "type": "array"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
-                            },
-                            "type": "array"
-                        },
-                        "SubscriptionName": {
-                            "type": "string"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdExpression": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Frequency",
-                        "MonitorArnList",
-                        "Subscribers",
-                        "SubscriptionName"
-                    ],
-                    "type": "object"
+                "EndpointServiceName": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalySubscription"
-                    ],
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping"
+                },
+                "VectorIndexName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionName",
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "Endpoint",
+                "FieldMapping",
+                "VectorIndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "MetadataField",
+                "TextField",
+                "VectorField"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.ResourceTag": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CollectionArn": {
                     "type": "string"
                 },
-                "Value": {
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                },
+                "VectorIndexName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "CollectionArn",
+                "FieldMapping",
+                "VectorIndexName"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.Subscriber": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "Status": {
+                "TextField": {
                     "type": "string"
                 },
-                "Type": {
+                "VectorField": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "MetadataField",
+                "TextField",
+                "VectorField"
             ],
             "type": "object"
         },
-        "AWS::CE::CostCategory": {
+        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ConnectionString": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DefaultValue": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RuleVersion": {
-                            "type": "string"
-                        },
-                        "Rules": {
-                            "type": "string"
-                        },
-                        "SplitChargeRules": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "RuleVersion",
-                        "Rules"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::CostCategory"
-                    ],
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectionString",
+                "CredentialsSecretArn",
+                "FieldMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "TextField": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "MetadataField",
+                "TextField"
             ],
             "type": "object"
         },
-        "AWS::CUR::ReportDefinition": {
+        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DatabaseName": {
                     "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": {
-                        "AdditionalArtifacts": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AdditionalSchemaElements": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BillingViewArn": {
-                            "type": "string"
-                        },
-                        "Compression": {
-                            "type": "string"
-                        },
-                        "Format": {
-                            "type": "string"
-                        },
-                        "RefreshClosedReports": {
-                            "type": "boolean"
-                        },
-                        "ReportName": {
-                            "type": "string"
-                        },
-                        "ReportVersioning": {
-                            "type": "string"
-                        },
-                        "S3Bucket": {
-                            "type": "string"
-                        },
-                        "S3Prefix": {
-                            "type": "string"
-                        },
-                        "S3Region": {
-                            "type": "string"
-                        },
-                        "TimeUnit": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Compression",
-                        "Format",
-                        "RefreshClosedReports",
-                        "ReportName",
-                        "ReportVersioning",
-                        "S3Bucket",
-                        "S3Prefix",
-                        "S3Region",
-                        "TimeUnit"
-                    ],
-                    "type": "object"
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CUR::ReportDefinition"
-                    ],
+                "ResourceArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "TableName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "FieldMapping",
+                "ResourceArn",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace": {
+        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "PrimaryKeyField": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "TextField": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "PrimaryKeyField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MongoDbAtlasConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "KeyspaceName": {
-                            "type": "string"
-                        },
-                        "ReplicationSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "type": "object"
+                "OpensearchServerlessConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Cassandra::Keyspace"
-                    ],
-                    "type": "string"
+                "PineconeConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "RdsConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
@@ -25765,22 +27400,22 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
+        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "RegionList": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "ReplicationStrategy": {
+                "EmbeddingModelArn": {
                     "type": "string"
+                },
+                "EmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration"
                 }
             },
+            "required": [
+                "EmbeddingModelArn"
+            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table": {
+        "AWS::Bedrock::Prompt": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25815,70 +27450,42 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoScalingSpecifications": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
-                        },
-                        "BillingMode": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
-                        },
-                        "ClientSideTimestampsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ClusteringKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
-                            },
-                            "type": "array"
-                        },
-                        "DefaultTimeToLive": {
-                            "type": "number"
-                        },
-                        "EncryptionSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
-                        },
-                        "KeyspaceName": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "PartitionKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
-                        },
-                        "PointInTimeRecoveryEnabled": {
-                            "type": "boolean"
-                        },
-                        "RegularColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
+                        "DefaultVariant": {
+                            "type": "string"
                         },
-                        "ReplicaSpecifications": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
                         },
-                        "TableName": {
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptVariant"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "KeyspaceName",
-                        "PartitionKeyColumns"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cassandra::Table"
+                        "AWS::Bedrock::Prompt"
                     ],
                     "type": "string"
                 },
@@ -25897,162 +27504,126 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.AutoScalingSetting": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoScalingDisabled": {
-                    "type": "boolean"
-                },
-                "MaximumUnits": {
-                    "type": "number"
-                },
-                "MinimumUnits": {
-                    "type": "number"
-                },
-                "ScalingPolicy": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.AutoScalingSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                },
-                "WriteCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.BillingMode": {
+        "AWS::Bedrock::Prompt.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Mode": {
-                    "type": "string"
-                },
-                "ProvisionedThroughput": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "Mode"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+        "AWS::Bedrock::Prompt.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "Column": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                },
-                "OrderBy": {
+                "Name": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Column"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.Column": {
+        "AWS::Bedrock::Prompt.PromptModelInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "ColumnType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnType"
-            ],
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.EncryptionSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "EncryptionType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "KmsKeyIdentifier": {
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "EncryptionType"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ProvisionedThroughput": {
+        "AWS::Bedrock::Prompt.PromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityUnits": {
-                    "type": "number"
-                },
-                "WriteCapacityUnits": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ReadCapacityUnits",
-                "WriteCapacityUnits"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ReplicaSpecification": {
+        "AWS::Bedrock::Prompt.PromptVariant": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInferenceConfiguration"
                 },
-                "ReadCapacityUnits": {
-                    "type": "number"
+                "ModelId": {
+                    "type": "string"
                 },
-                "Region": {
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Region"
+                "Name",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ScalingPolicy": {
+        "AWS::Bedrock::Prompt.TextPromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "TargetTrackingScalingPolicyConfiguration": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextS3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextS3Location"
                 }
             },
             "type": "object"
         },
-        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+        "AWS::Bedrock::Prompt.TextS3Location": {
             "additionalProperties": false,
             "properties": {
-                "DisableScaleIn": {
-                    "type": "boolean"
-                },
-                "ScaleInCooldown": {
-                    "type": "number"
+                "Bucket": {
+                    "type": "string"
                 },
-                "ScaleOutCooldown": {
-                    "type": "number"
+                "Key": {
+                    "type": "string"
                 },
-                "TargetValue": {
-                    "type": "number"
+                "Version": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TargetValue"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account": {
+        "AWS::Bedrock::PromptVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26087,18 +27658,30 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExpiryEventsConfiguration": {
-                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PromptArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "ExpiryEventsConfiguration"
+                        "PromptArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Account"
+                        "AWS::Bedrock::PromptVersion"
                     ],
                     "type": "string"
                 },
@@ -26117,16 +27700,107 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+        "AWS::Bedrock::PromptVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "DaysBeforeExpiry": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                },
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
                     "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate": {
+        "AWS::Bedrock::PromptVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInferenceConfiguration"
+                },
+                "ModelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "TemplateType"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26161,48 +27835,39 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CertificateAuthorityArn": {
-                            "type": "string"
+                        "AccountGrouping": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
                         },
-                        "CertificateTransparencyLoggingPreference": {
-                            "type": "string"
+                        "ComputationPreference": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
                         },
-                        "DomainName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "DomainValidationOptions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
-                            },
-                            "type": "array"
-                        },
-                        "KeyAlgorithm": {
+                        "Name": {
                             "type": "string"
                         },
-                        "SubjectAlternativeNames": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "PrimaryAccountId": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ValidationMethod": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "AccountGrouping",
+                        "ComputationPreference",
+                        "Name",
+                        "PrimaryAccountId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Certificate"
+                        "AWS::BillingConductor::BillingGroup"
                     ],
                     "type": "string"
                 },
@@ -26221,25 +27886,37 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "HostedZoneId": {
-                    "type": "string"
+                "AutoAssociate": {
+                    "type": "boolean"
                 },
-                "ValidationDomain": {
+                "LinkedAccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LinkedAccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "PricingPlanArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "DomainName"
+                "PricingPlanArn"
             ],
             "type": "object"
         },
-        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26274,52 +27951,40 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
-                            "type": "string"
-                        },
-                        "GuardrailPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "IamRoleArn": {
+                        "AccountId": {
                             "type": "string"
                         },
-                        "LoggingLevel": {
+                        "BillingGroupArn": {
                             "type": "string"
                         },
-                        "SnsTopicArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "BillingPeriodRange": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
                         },
-                        "TeamId": {
-                            "type": "string"
+                        "CustomLineItemChargeDetails": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
                         },
-                        "TeamsChannelId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TeamsTenantId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "UserRoleRequired": {
-                            "type": "boolean"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "TeamId",
-                        "TeamsChannelId",
-                        "TeamsTenantId"
+                        "BillingGroupArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
+                        "AWS::BillingConductor::CustomLineItem"
                     ],
                     "type": "string"
                 },
@@ -26338,7 +28003,96 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Chatbot::SlackChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+            "additionalProperties": false,
+            "properties": {
+                "ExclusiveEndBillingPeriod": {
+                    "type": "string"
+                },
+                "InclusiveStartBillingPeriod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Flat": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
+                },
+                "LineItemFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                    },
+                    "type": "array"
+                },
+                "Percentage": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChargeValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChargeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssociatedResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PercentageValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "PercentageValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MatchOption": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attribute",
+                "MatchOption",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::PricingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26373,48 +28127,33 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "GuardrailPolicies": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PricingRuleArns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "IamRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingLevel": {
-                            "type": "string"
-                        },
-                        "SlackChannelId": {
-                            "type": "string"
-                        },
-                        "SlackWorkspaceId": {
-                            "type": "string"
-                        },
-                        "SnsTopicArns": {
+                        "Tags": {
                             "items": {
-                                "type": "string"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserRoleRequired": {
-                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "SlackChannelId",
-                        "SlackWorkspaceId"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::SlackChannelConfiguration"
+                        "AWS::BillingConductor::PricingPlan"
                     ],
                     "type": "string"
                 },
@@ -26433,7 +28172,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate": {
+        "AWS::BillingConductor::PricingRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26468,45 +28207,53 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AnalysisParameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
-                            },
-                            "type": "array"
+                        "BillingEntity": {
+                            "type": "string"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "Format": {
+                        "ModifierPercentage": {
+                            "type": "number"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Operation": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Scope": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        "Service": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Tiering": {
+                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UsageType": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "MembershipIdentifier",
                         "Name",
-                        "Source"
+                        "Scope",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::AnalysisTemplate"
+                        "AWS::BillingConductor::PricingRule"
                     ],
                     "type": "string"
                 },
@@ -26525,53 +28272,28 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
-            "additionalProperties": false,
-            "properties": {
-                "DefaultValue": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+        "AWS::BillingConductor::PricingRule.FreeTier": {
             "additionalProperties": false,
             "properties": {
-                "ReferencedTables": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Activated": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "ReferencedTables"
+                "Activated"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+        "AWS::BillingConductor::PricingRule.Tiering": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
-                    "type": "string"
+                "FreeTier": {
+                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
                 }
             },
-            "required": [
-                "Text"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration": {
+        "AWS::Budgets::Budget": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26606,56 +28328,30 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CreatorDisplayName": {
-                            "type": "string"
-                        },
-                        "CreatorMemberAbilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "CreatorPaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
-                        },
-                        "DataEncryptionMetadata": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
-                        },
-                        "Description": {
-                            "type": "string"
+                        "Budget": {
+                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
                         },
-                        "Members": {
+                        "NotificationsWithSubscribers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
                             },
                             "type": "array"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "CreatorDisplayName",
-                        "CreatorMemberAbilities",
-                        "Description",
-                        "Members",
-                        "Name",
-                        "QueryLogStatus"
+                        "Budget"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Collaboration"
+                        "AWS::Budgets::Budget"
                     ],
                     "type": "string"
                 },
@@ -26674,417 +28370,211 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+        "AWS::Budgets::Budget.AutoAdjustData": {
             "additionalProperties": false,
             "properties": {
-                "AllowCleartext": {
-                    "type": "boolean"
-                },
-                "AllowDuplicates": {
-                    "type": "boolean"
-                },
-                "AllowJoinsOnColumnsWithDifferentNames": {
-                    "type": "boolean"
+                "AutoAdjustType": {
+                    "type": "string"
                 },
-                "PreserveNulls": {
-                    "type": "boolean"
+                "HistoricalOptions": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
                 }
             },
             "required": [
-                "AllowCleartext",
-                "AllowDuplicates",
-                "AllowJoinsOnColumnsWithDifferentNames",
-                "PreserveNulls"
+                "AutoAdjustType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+        "AWS::Budgets::Budget.BudgetData": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "AutoAdjustData": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
+                },
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
                     "type": "string"
                 },
-                "DisplayName": {
+                "BudgetType": {
                     "type": "string"
                 },
-                "MemberAbilities": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "CostFilters": {
+                    "type": "object"
                 },
-                "PaymentConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AccountId",
-                "DisplayName",
-                "MemberAbilities"
+                "BudgetType",
+                "TimeUnit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+        "AWS::Budgets::Budget.CostTypes": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                "IncludeCredit": {
+                    "type": "boolean"
+                },
+                "IncludeDiscount": {
+                    "type": "boolean"
+                },
+                "IncludeOtherSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeRecurring": {
+                    "type": "boolean"
+                },
+                "IncludeRefund": {
+                    "type": "boolean"
+                },
+                "IncludeSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeSupport": {
+                    "type": "boolean"
+                },
+                "IncludeTax": {
+                    "type": "boolean"
+                },
+                "IncludeUpfront": {
+                    "type": "boolean"
+                },
+                "UseAmortized": {
+                    "type": "boolean"
+                },
+                "UseBlended": {
+                    "type": "boolean"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+        "AWS::Budgets::Budget.HistoricalOptions": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "BudgetAdjustmentPeriod": {
+                    "type": "number"
                 }
             },
             "required": [
-                "IsResponsible"
+                "BudgetAdjustmentPeriod"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable": {
+        "AWS::Budgets::Budget.Notification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ComparisonOperator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "NotificationType": {
                     "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": {
-                        "AllowedColumns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AnalysisMethod": {
-                            "type": "string"
-                        },
-                        "AnalysisRules": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "TableReference": {
-                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "AllowedColumns",
-                        "AnalysisMethod",
-                        "Name",
-                        "TableReference"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CleanRooms::ConfiguredTable"
-                    ],
-                    "type": "string"
+                "Threshold": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ThresholdType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "ComparisonOperator",
+                "NotificationType",
+                "Threshold"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
+        "AWS::Budgets::Budget.NotificationWithSubscribers": {
             "additionalProperties": false,
             "properties": {
-                "ColumnNames": {
+                "Notification": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
+                },
+                "Subscribers": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
                     },
                     "type": "array"
-                },
-                "Function": {
-                    "type": "string"
                 }
             },
             "required": [
-                "ColumnNames",
-                "Function"
+                "Notification",
+                "Subscribers"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+        "AWS::Budgets::Budget.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Key": {
                     "type": "string"
                 },
-                "Minimum": {
-                    "type": "number"
-                },
-                "Type": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "ColumnName",
-                "Minimum",
-                "Type"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+        "AWS::Budgets::Budget.Spend": {
             "additionalProperties": false,
             "properties": {
-                "Policy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                "Amount": {
+                    "type": "number"
                 },
-                "Type": {
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Policy",
-                "Type"
+                "Amount",
+                "Unit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+        "AWS::Budgets::Budget.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "AggregateColumns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
-                    },
-                    "type": "array"
-                },
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DimensionColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinRequired": {
+                "Address": {
                     "type": "string"
                 },
-                "OutputConstraints": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
-                    },
-                    "type": "array"
-                },
-                "ScalarFunctions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AggregateColumns",
-                "DimensionColumns",
-                "JoinColumns",
-                "OutputConstraints",
-                "ScalarFunctions"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
-            "additionalProperties": false,
-            "properties": {
-                "AllowedAnalyses": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AllowedAnalysisProviders": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DifferentialPrivacy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
-                }
-            },
-            "required": [
-                "AllowedAnalyses"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
-            "additionalProperties": false,
-            "properties": {
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "ListColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "JoinColumns",
-                "ListColumns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "V1": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
-                }
-            },
-            "required": [
-                "V1"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
-            "additionalProperties": false,
-            "properties": {
-                "Aggregation": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
-                },
-                "Custom": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
-                },
-                "List": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
-            "additionalProperties": false,
-            "properties": {
-                "Columns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "Columns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "Name": {
+                "SubscriptionType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name"
+                "Address",
+                "SubscriptionType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+        "AWS::Budgets::Budget.TimePeriod": {
             "additionalProperties": false,
             "properties": {
-                "DatabaseName": {
+                "End": {
                     "type": "string"
                 },
-                "TableName": {
+                "Start": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DatabaseName",
-                "TableName"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.TableReference": {
-            "additionalProperties": false,
-            "properties": {
-                "Glue": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
-                }
-            },
-            "required": [
-                "Glue"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTableAssociation": {
+        "AWS::Budgets::BudgetsAction": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27119,39 +28609,54 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfiguredTableIdentifier": {
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
+                        },
+                        "ActionType": {
                             "type": "string"
                         },
-                        "Description": {
+                        "ApprovalModel": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "BudgetName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "NotificationType": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "ConfiguredTableIdentifier",
-                        "MembershipIdentifier",
-                        "Name",
-                        "RoleArn"
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTableAssociation"
+                        "AWS::Budgets::BudgetsAction"
                     ],
                     "type": "string"
                 },
@@ -27170,158 +28675,142 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership": {
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
             "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": {
-                        "CollaborationIdentifier": {
-                            "type": "string"
-                        },
-                        "DefaultResultConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
-                        },
-                        "PaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "CollaborationIdentifier",
-                        "QueryLogStatus"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::CleanRooms::Membership"
-                    ],
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Value": {
+                    "type": "number"
                 }
             },
             "required": [
                 "Type",
-                "Properties"
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
+        "AWS::Budgets::BudgetsAction.Definition": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
+                },
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyArn": {
+                    "type": "string"
+                },
+                "Roles": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Users": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "S3"
+                "PolicyArn"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+        "AWS::Budgets::BudgetsAction.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "OutputConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "RoleArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "OutputConfiguration"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "PolicyId": {
+                    "type": "string"
+                },
+                "TargetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "IsResponsible"
+                "PolicyId",
+                "TargetIds"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "InstanceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
                     "type": "string"
                 },
-                "KeyPrefix": {
+                "Subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceIds",
+                "Region",
+                "Subtype"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
                     "type": "string"
                 },
-                "ResultFormat": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "ResultFormat"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate": {
+        "AWS::CDK::Metadata": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27356,36 +28845,15 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoRefresh": {
-                            "type": "string"
-                        },
-                        "MembershipIdentifier": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
-                        },
-                        "PrivacyBudgetType": {
+                        "Analytics": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
-                    "required": [
-                        "AutoRefresh",
-                        "MembershipIdentifier",
-                        "Parameters",
-                        "PrivacyBudgetType"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::PrivacyBudgetTemplate"
+                        "AWS::CDK::Metadata"
                     ],
                     "type": "string"
                 },
@@ -27399,28 +28867,11 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
-            "additionalProperties": false,
-            "properties": {
-                "Epsilon": {
-                    "type": "number"
-                },
-                "UsersNoisePerQuery": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Epsilon",
-                "UsersNoisePerQuery"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset": {
+        "AWS::CE::AnomalyMonitor": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27455,38 +28906,34 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "MonitorDimension": {
                             "type": "string"
                         },
-                        "Name": {
+                        "MonitorName": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "MonitorSpecification": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "MonitorType": {
+                            "type": "string"
                         },
-                        "TrainingData": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RoleArn",
-                        "TrainingData"
+                        "MonitorName",
+                        "MonitorType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRoomsML::TrainingDataset"
+                        "AWS::CE::AnomalyMonitor"
                     ],
                     "type": "string"
                 },
@@ -27505,92 +28952,23 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
-            "additionalProperties": false,
-            "properties": {
-                "ColumnName": {
-                    "type": "string"
-                },
-                "ColumnTypes": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnTypes"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "GlueDataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
-                }
-            },
-            "required": [
-                "GlueDataSource"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
-            "additionalProperties": false,
-            "properties": {
-                "InputConfig": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputConfig",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "DataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
-                },
-                "Schema": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "DataSource",
-                "Schema"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
+        "AWS::CE::AnomalyMonitor.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "CatalogId": {
-                    "type": "string"
-                },
-                "DatabaseName": {
+                "Key": {
                     "type": "string"
                 },
-                "TableName": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "DatabaseName",
-                "TableName"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2": {
+        "AWS::CE::AnomalySubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27625,52 +29003,48 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutomaticStopTimeMinutes": {
-                            "type": "number"
-                        },
-                        "ConnectionType": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ImageId": {
-                            "type": "string"
-                        },
-                        "InstanceType": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "OwnerArn": {
+                        "Frequency": {
                             "type": "string"
                         },
-                        "Repositories": {
+                        "MonitorArnList": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "SubnetId": {
-                            "type": "string"
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
+                            },
+                            "type": "array"
                         },
-                        "Tags": {
+                        "Subscribers": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
                             },
                             "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdExpression": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "ImageId",
-                        "InstanceType"
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cloud9::EnvironmentEC2"
+                        "AWS::CE::AnomalySubscription"
                     ],
                     "type": "string"
                 },
@@ -27689,88 +29063,42 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2.Repository": {
+        "AWS::CE::AnomalySubscription.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "PathComponent": {
+                "Key": {
                     "type": "string"
                 },
-                "RepositoryUrl": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "PathComponent",
-                "RepositoryUrl"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::CustomResource": {
+        "AWS::CE::AnomalySubscription.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Address": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Status": {
                     "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": {
-                        "ServiceToken": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ServiceToken"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::CloudFormation::CustomResource"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookDefaultVersion": {
+        "AWS::CE::CostCategory": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27805,21 +29133,32 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "DefaultValue": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "Name": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "RuleVersion": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "type": "string"
+                        },
+                        "SplitChargeRules": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "RuleVersion",
+                        "Rules"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookDefaultVersion"
+                        "AWS::CE::CostCategory"
                     ],
                     "type": "string"
                 },
@@ -27833,11 +29172,12 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookTypeConfig": {
+        "AWS::CUR::ReportDefinition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27872,27 +29212,65 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
+                        "AdditionalArtifacts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdditionalSchemaElements": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BillingViewArn": {
                             "type": "string"
                         },
-                        "ConfigurationAlias": {
+                        "Compression": {
                             "type": "string"
                         },
-                        "TypeArn": {
+                        "Format": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "RefreshClosedReports": {
+                            "type": "boolean"
+                        },
+                        "ReportName": {
+                            "type": "string"
+                        },
+                        "ReportVersioning": {
+                            "type": "string"
+                        },
+                        "S3Bucket": {
+                            "type": "string"
+                        },
+                        "S3Prefix": {
+                            "type": "string"
+                        },
+                        "S3Region": {
+                            "type": "string"
+                        },
+                        "TimeUnit": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Configuration"
+                        "Compression",
+                        "Format",
+                        "RefreshClosedReports",
+                        "ReportName",
+                        "ReportVersioning",
+                        "S3Bucket",
+                        "S3Prefix",
+                        "S3Region",
+                        "TimeUnit"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookTypeConfig"
+                        "AWS::CUR::ReportDefinition"
                     ],
                     "type": "string"
                 },
@@ -27911,7 +29289,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion": {
+        "AWS::Cassandra::Keyspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27946,28 +29324,24 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
-                        },
-                        "SchemaHandlerPackage": {
-                            "type": "string"
+                        "ReplicationSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
                         },
-                        "TypeName": {
-                            "type": "string"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
-                    "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookVersion"
+                        "AWS::Cassandra::Keyspace"
                     ],
                     "type": "string"
                 },
@@ -27981,24 +29355,26 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion.LoggingConfig": {
+        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
-                    "type": "string"
+                "RegionList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "LogRoleArn": {
+                "ReplicationStrategy": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::CloudFormation::Macro": {
+        "AWS::Cassandra::Table": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28033,31 +29409,70 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "AutoScalingSpecifications": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
                         },
-                        "FunctionName": {
-                            "type": "string"
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
                         },
-                        "LogGroupName": {
-                            "type": "string"
+                        "ClientSideTimestampsEnabled": {
+                            "type": "boolean"
                         },
-                        "LogRoleARN": {
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultTimeToLive": {
+                            "type": "number"
+                        },
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
+                        },
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "PartitionKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "PointInTimeRecoveryEnabled": {
+                            "type": "boolean"
+                        },
+                        "RegularColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "ReplicaSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TableName": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "FunctionName",
-                        "Name"
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Macro"
+                        "AWS::Cassandra::Table"
                     ],
                     "type": "string"
                 },
@@ -28076,81 +29491,169 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleDefaultVersion": {
+        "AWS::Cassandra::Table.AutoScalingSetting": {
             "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"
+                "AutoScalingDisabled": {
+                    "type": "boolean"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Arn": {
-                            "type": "string"
-                        },
-                        "ModuleName": {
-                            "type": "string"
-                        },
-                        "VersionId": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
+                "MaximumUnits": {
+                    "type": "number"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CloudFormation::ModuleDefaultVersion"
-                    ],
-                    "type": "string"
+                "MinimumUnits": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "ScalingPolicy": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
                 }
             },
-            "required": [
-                "Type"
-            ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleVersion": {
+        "AWS::Cassandra::Table.AutoScalingSpecification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
                 },
-                "DeletionPolicy": {
-                    "enum": [
+                "WriteCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.BillingMode": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                },
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                },
+                "OrderBy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Column"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "ColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "ColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.EncryptionSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKeyIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
                         "Delete",
                         "Retain",
                         "Snapshot"
@@ -28178,22 +29681,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ModuleName": {
-                            "type": "string"
-                        },
-                        "ModulePackage": {
-                            "type": "string"
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
                         }
                     },
                     "required": [
-                        "ModuleName",
-                        "ModulePackage"
+                        "ExpiryEventsConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleVersion"
+                        "AWS::CertificateManager::Account"
                     ],
                     "type": "string"
                 },
@@ -28212,7 +29711,16 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::PublicTypeVersion": {
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28247,27 +29755,48 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "CertificateAuthorityArn": {
                             "type": "string"
                         },
-                        "LogDeliveryBucket": {
+                        "CertificateTransparencyLoggingPreference": {
                             "type": "string"
                         },
-                        "PublicVersionNumber": {
+                        "DomainName": {
                             "type": "string"
                         },
-                        "Type": {
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "KeyAlgorithm": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DomainName"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::PublicTypeVersion"
+                        "AWS::CertificateManager::Certificate"
                     ],
                     "type": "string"
                 },
@@ -28281,11 +29810,30 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::Publisher": {
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28320,21 +29868,58 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AcceptTermsAndConditions": {
-                            "type": "boolean"
+                        "ConfigurationName": {
+                            "type": "string"
                         },
-                        "ConnectionArn": {
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TeamId": {
                             "type": "string"
+                        },
+                        "TeamsChannelId": {
+                            "type": "string"
+                        },
+                        "TeamsTenantId": {
+                            "type": "string"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "AcceptTermsAndConditions"
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "TeamId",
+                        "TeamsChannelId",
+                        "TeamsTenantId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Publisher"
+                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -28353,7 +29938,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceDefaultVersion": {
+        "AWS::Chatbot::SlackChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28388,21 +29973,54 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
                             "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceDefaultVersion"
+                        "AWS::Chatbot::SlackChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -28416,11 +30034,12 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion": {
+        "AWS::CleanRooms::AnalysisTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28455,28 +30074,45 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "AnalysisParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        "Format": {
+                            "type": "string"
                         },
-                        "SchemaHandlerPackage": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "Format",
+                        "MembershipIdentifier",
+                        "Name",
+                        "Source"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceVersion"
+                        "AWS::CleanRooms::AnalysisTemplate"
                     ],
                     "type": "string"
                 },
@@ -28495,19 +30131,53 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "DefaultValue": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Name",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::Stack": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferencedTables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ReferencedTables"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28542,42 +30212,56 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "NotificationARNs": {
+                        "CreatorDisplayName": {
+                            "type": "string"
+                        },
+                        "CreatorMemberAbilities": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Parameters": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
+                        "CreatorPaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
                         },
-                        "Tags": {
+                        "DataEncryptionMetadata": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Members": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
                             },
                             "type": "array"
                         },
-                        "TemplateURL": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TimeoutInMinutes": {
-                            "type": "number"
+                        "QueryLogStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "TemplateURL"
+                        "CreatorDisplayName",
+                        "CreatorMemberAbilities",
+                        "Description",
+                        "Members",
+                        "Name",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Stack"
+                        "AWS::CleanRooms::Collaboration"
                     ],
                     "type": "string"
                 },
@@ -28596,7 +30280,81 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet": {
+        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCleartext": {
+                    "type": "boolean"
+                },
+                "AllowDuplicates": {
+                    "type": "boolean"
+                },
+                "AllowJoinsOnColumnsWithDifferentNames": {
+                    "type": "boolean"
+                },
+                "PreserveNulls": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowCleartext",
+                "AllowDuplicates",
+                "AllowJoinsOnColumnsWithDifferentNames",
+                "PreserveNulls"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "MemberAbilities": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PaymentConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                }
+            },
+            "required": [
+                "AccountId",
+                "DisplayName",
+                "MemberAbilities"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28631,73 +30389,48 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdministrationRoleARN": {
-                            "type": "string"
-                        },
-                        "AutoDeployment": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
-                        },
-                        "CallAs": {
-                            "type": "string"
-                        },
-                        "Capabilities": {
+                        "AllowedColumns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ExecutionRoleName": {
+                        "AnalysisMethod": {
                             "type": "string"
                         },
-                        "ManagedExecution": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
-                        },
-                        "OperationPreferences": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
-                        },
-                        "Parameters": {
+                        "AnalysisRules": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
                             },
                             "type": "array"
                         },
-                        "PermissionModel": {
+                        "Description": {
                             "type": "string"
                         },
-                        "StackInstancesGroup": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
-                            },
-                            "type": "array"
-                        },
-                        "StackSetName": {
+                        "Name": {
                             "type": "string"
                         },
+                        "TableReference": {
+                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TemplateBody": {
-                            "type": "string"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "PermissionModel",
-                        "StackSetName"
+                        "AllowedColumns",
+                        "AnalysisMethod",
+                        "Name",
+                        "TableReference"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::StackSet"
+                        "AWS::CleanRooms::ConfiguredTable"
                     ],
                     "type": "string"
                 },
@@ -28716,107 +30449,168 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.AutoDeployment": {
+        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "RetainStacksOnAccountRemoval": {
-                    "type": "boolean"
+                "Function": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ColumnNames",
+                "Function"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
             "additionalProperties": false,
             "properties": {
-                "AccountFilterType": {
+                "ColumnName": {
                     "type": "string"
                 },
-                "Accounts": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Minimum": {
+                    "type": "number"
                 },
-                "AccountsUrl": {
+                "Type": {
                     "type": "string"
-                },
-                "OrganizationalUnitIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Minimum",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.ManagedExecution": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
             "additionalProperties": false,
             "properties": {
-                "Active": {
-                    "type": "boolean"
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "Policy",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.OperationPreferences": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
             "additionalProperties": false,
             "properties": {
-                "FailureToleranceCount": {
-                    "type": "number"
+                "AdditionalAnalyses": {
+                    "type": "string"
                 },
-                "FailureTolerancePercentage": {
-                    "type": "number"
+                "AggregateColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
+                    },
+                    "type": "array"
                 },
-                "MaxConcurrentCount": {
-                    "type": "number"
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "MaxConcurrentPercentage": {
-                    "type": "number"
+                "DimensionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "RegionConcurrencyType": {
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinRequired": {
                     "type": "string"
                 },
-                "RegionOrder": {
+                "OutputConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                    },
+                    "type": "array"
+                },
+                "ScalarFunctions": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 }
             },
+            "required": [
+                "AggregateColumns",
+                "DimensionColumns",
+                "JoinColumns",
+                "OutputConstraints",
+                "ScalarFunctions"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.Parameter": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
             "additionalProperties": false,
             "properties": {
-                "ParameterKey": {
+                "AdditionalAnalyses": {
                     "type": "string"
                 },
-                "ParameterValue": {
-                    "type": "string"
+                "AllowedAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedAnalysisProviders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DifferentialPrivacy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                },
+                "DisallowedOutputColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "ParameterKey",
-                "ParameterValue"
+                "AllowedAnalyses"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.StackInstances": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
             "additionalProperties": false,
             "properties": {
-                "DeploymentTargets": {
-                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                "AdditionalAnalyses": {
+                    "type": "string"
                 },
-                "ParameterOverrides": {
+                "AllowedJoinOperators": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "Regions": {
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ListColumns": {
                     "items": {
                         "type": "string"
                     },
@@ -28824,12 +30618,94 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "DeploymentTargets",
-                "Regions"
+                "JoinColumns",
+                "ListColumns"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation": {
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.TableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Glue": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
+                }
+            },
+            "required": [
+                "Glue"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28864,42 +30740,45 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoUpdate": {
-                            "type": "boolean"
-                        },
-                        "ExecutionRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
-                        },
-                        "MajorVersion": {
-                            "type": "string"
+                        "ConfiguredTableAssociationAnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule"
+                            },
+                            "type": "array"
                         },
-                        "PublicTypeArn": {
+                        "ConfiguredTableIdentifier": {
                             "type": "string"
                         },
-                        "PublisherId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "Type": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeNameAlias": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "VersionBump": {
-                            "type": "string"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ConfiguredTableIdentifier",
+                        "MembershipIdentifier",
+                        "Name",
+                        "RoleArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::TypeActivation"
+                        "AWS::CleanRooms::ConfiguredTableAssociation"
                     ],
                     "type": "string"
                 },
@@ -28913,31 +30792,114 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
-                    "type": "string"
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy"
                 },
-                "LogRoleArn": {
+                "Type": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Policy",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitCondition": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
-                "CreationPolicy": {
-                    "type": "object"
-                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -28967,21 +30929,38 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Count": {
-                            "type": "number"
+                        "Description": {
+                            "type": "string"
                         },
-                        "Handle": {
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig"
+                        },
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Timeout": {
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitCondition"
+                        "AWS::CleanRooms::IdMappingTable"
                     ],
                     "type": "string"
                 },
@@ -28995,11 +30974,59 @@ var CdkSchema = `{
                 }
             },
             "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingTableInputSource": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "IdMappingTableInputSource"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "IdNamespaceAssociationId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdNamespaceAssociationId",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitConditionHandle": {
+        "AWS::CleanRooms::IdNamespaceAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29033,12 +31060,39 @@ var CdkSchema = `{
                 },
                 "Properties": {
                     "additionalProperties": false,
-                    "properties": {},
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IdMappingConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig"
+                        },
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitConditionHandle"
+                        "AWS::CleanRooms::IdNamespaceAssociation"
                     ],
                     "type": "string"
                 },
@@ -29052,21 +31106,65 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy": {
+        "AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "AllowUseAsDimensionColumn": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowUseAsDimensionColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingWorkflowsSupported": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "IdNamespaceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
                     ],
                     "type": "string"
                 },
@@ -29091,18 +31189,34 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CachePolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        "CollaborationIdentifier": {
+                            "type": "string"
+                        },
+                        "DefaultResultConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
+                        },
+                        "PaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
+                        },
+                        "QueryLogStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "CachePolicyConfig"
+                        "CollaborationIdentifier",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CachePolicy"
+                        "AWS::CleanRooms::Membership"
                     ],
                     "type": "string"
                 },
@@ -29121,119 +31235,77 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "MaxTTL": {
-                    "type": "number"
-                },
-                "MinTTL": {
-                    "type": "number"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "ParametersInCacheKeyAndForwardedToOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
                 }
             },
             "required": [
-                "DefaultTTL",
-                "MaxTTL",
-                "MinTTL",
-                "Name",
-                "ParametersInCacheKeyAndForwardedToOrigin"
+                "QueryCompute"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CookieBehavior": {
-                    "type": "string"
-                },
-                "Cookies": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "S3": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
                 }
             },
             "required": [
-                "CookieBehavior"
+                "S3"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "HeaderBehavior": {
-                    "type": "string"
+                "OutputConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
                 },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "RoleArn": {
+                    "type": "string"
                 }
             },
             "required": [
-                "HeaderBehavior"
+                "OutputConfiguration"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
+        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
             "additionalProperties": false,
             "properties": {
-                "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
-                },
-                "EnableAcceptEncodingBrotli": {
-                    "type": "boolean"
-                },
-                "EnableAcceptEncodingGzip": {
+                "IsResponsible": {
                     "type": "boolean"
-                },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
-                },
-                "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
                 }
             },
             "required": [
-                "CookiesConfig",
-                "EnableAcceptEncodingGzip",
-                "HeadersConfig",
-                "QueryStringsConfig"
+                "IsResponsible"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "QueryStringBehavior": {
+                "Bucket": {
                     "type": "string"
                 },
-                "QueryStrings": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "ResultFormat": {
+                    "type": "string"
                 }
             },
             "required": [
-                "QueryStringBehavior"
+                "Bucket",
+                "ResultFormat"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29268,18 +31340,36 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CloudFrontOriginAccessIdentityConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        "AutoRefresh": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        },
+                        "PrivacyBudgetType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "CloudFrontOriginAccessIdentityConfig"
+                        "AutoRefresh",
+                        "MembershipIdentifier",
+                        "Parameters",
+                        "PrivacyBudgetType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        "AWS::CleanRooms::PrivacyBudgetTemplate"
                     ],
                     "type": "string"
                 },
@@ -29298,19 +31388,23 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
+                "Epsilon": {
+                    "type": "number"
+                },
+                "UsersNoisePerQuery": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Comment"
+                "Epsilon",
+                "UsersNoisePerQuery"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+        "AWS::CleanRoomsML::TrainingDataset": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29345,18 +31439,38 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContinuousDeploymentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrainingData": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ContinuousDeploymentPolicyConfig"
+                        "Name",
+                        "RoleArn",
+                        "TrainingData"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                        "AWS::CleanRoomsML::TrainingDataset"
                     ],
                     "type": "string"
                 },
@@ -29375,134 +31489,207 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "SingleHeaderPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
-                },
-                "SingleWeightPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                "ColumnName": {
+                    "type": "string"
                 },
-                "StagingDistributionDnsNames": {
+                "ColumnTypes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
-                },
-                "TrafficConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
-                },
-                "Type": {
-                    "type": "string"
                 }
             },
             "required": [
-                "Enabled",
-                "StagingDistributionDnsNames"
+                "ColumnName",
+                "ColumnTypes"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
             "additionalProperties": false,
             "properties": {
-                "IdleTTL": {
-                    "type": "number"
-                },
-                "MaximumTTL": {
-                    "type": "number"
+                "GlueDataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
                 }
             },
             "required": [
-                "IdleTTL",
-                "MaximumTTL"
+                "GlueDataSource"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
-                    "type": "string"
+                "InputConfig": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
                 },
-                "Value": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "InputConfig",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
-                    "type": "string"
+                "DataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
                 },
-                "Value": {
-                    "type": "string"
+                "Schema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "DataSource",
+                "Schema"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "CatalogId": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Weight"
+                "DatabaseName",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+        "AWS::Cloud9::EnvironmentEC2": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "Condition": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "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": {
+                        "AutomaticStopTimeMinutes": {
+                            "type": "number"
+                        },
+                        "ConnectionType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OwnerArn": {
+                            "type": "string"
+                        },
+                        "Repositories": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cloud9::EnvironmentEC2"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "Weight"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
             "additionalProperties": false,
             "properties": {
-                "SingleHeaderConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
-                },
-                "SingleWeightConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                "PathComponent": {
+                    "type": "string"
                 },
-                "Type": {
+                "RepositoryUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "PathComponent",
+                "RepositoryUrl"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution": {
+        "AWS::CloudFormation::CustomResource": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29537,24 +31724,21 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        "ServiceTimeout": {
+                            "type": "number"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "ServiceToken": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DistributionConfig"
+                        "ServiceToken"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Distribution"
+                        "AWS::CloudFormation::CustomResource"
                     ],
                     "type": "string"
                 },
@@ -29573,685 +31757,657 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CacheBehavior": {
+        "AWS::CloudFormation::HookDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CachePolicyId": {
+                "Condition": {
                     "type": "string"
                 },
-                "CachedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "LambdaFunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                },
-                "MaxTTL": {
-                    "type": "number"
-                },
-                "MinTTL": {
-                    "type": "number"
+                    "type": "object"
                 },
-                "OriginRequestPolicyId": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookDefaultVersion"
+                    ],
                     "type": "string"
                 },
-                "PathPattern": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                },
-                "RealtimeLogConfigArn": {
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::HookTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
                     "type": "string"
                 },
-                "ResponseHeadersPolicyId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "TargetOriginId": {
-                    "type": "string"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "ConfigurationAlias": {
+                            "type": "string"
+                        },
+                        "TypeArn": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
                 },
-                "TrustedSigners": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookTypeConfig"
+                    ],
+                    "type": "string"
                 },
-                "ViewerProtocolPolicy": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "PathPattern",
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Cookies": {
+        "AWS::CloudFormation::HookVersion": {
             "additionalProperties": false,
             "properties": {
-                "Forward": {
+                "Condition": {
                     "type": "string"
                 },
-                "WhitelistedNames": {
-                    "items": {
-                        "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": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "Forward"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+        "AWS::CloudFormation::HookVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "ErrorCachingMinTTL": {
-                    "type": "number"
-                },
-                "ErrorCode": {
-                    "type": "number"
-                },
-                "ResponseCode": {
-                    "type": "number"
+                "LogGroupName": {
+                    "type": "string"
                 },
-                "ResponsePagePath": {
+                "LogRoleArn": {
                     "type": "string"
                 }
             },
-            "required": [
-                "ErrorCode"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+        "AWS::CloudFormation::Macro": {
             "additionalProperties": false,
             "properties": {
-                "HTTPPort": {
-                    "type": "number"
-                },
-                "HTTPSPort": {
-                    "type": "number"
-                },
-                "OriginKeepaliveTimeout": {
-                    "type": "number"
+                "Condition": {
+                    "type": "string"
                 },
-                "OriginProtocolPolicy": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "OriginReadTimeout": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginSSLProtocols": {
-                    "items": {
-                        "type": "string"
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "OriginProtocolPolicy"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
+        "AWS::CloudFormation::ModuleDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CachePolicyId": {
+                "Condition": {
                     "type": "string"
                 },
-                "CachedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "LambdaFunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                },
-                "MaxTTL": {
-                    "type": "number"
-                },
-                "MinTTL": {
-                    "type": "number"
-                },
-                "OriginRequestPolicyId": {
-                    "type": "string"
-                },
-                "RealtimeLogConfigArn": {
-                    "type": "string"
-                },
-                "ResponseHeadersPolicyId": {
-                    "type": "string"
-                },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                    "type": "object"
                 },
-                "TargetOriginId": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
                     "type": "string"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TrustedSigners": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "ViewerProtocolPolicy": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.DistributionConfig": {
+        "AWS::CloudFormation::ModuleVersion": {
             "additionalProperties": false,
             "properties": {
-                "Aliases": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CNAMEs": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CacheBehaviors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CacheBehavior"
-                    },
-                    "type": "array"
-                },
-                "Comment": {
-                    "type": "string"
-                },
-                "ContinuousDeploymentPolicyId": {
-                    "type": "string"
-                },
-                "CustomErrorResponses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomErrorResponse"
-                    },
-                    "type": "array"
-                },
-                "CustomOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyCustomOrigin"
-                },
-                "DefaultCacheBehavior": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.DefaultCacheBehavior"
-                },
-                "DefaultRootObject": {
+                "Condition": {
                     "type": "string"
                 },
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "HttpVersion": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "IPV6Enabled": {
-                    "type": "boolean"
-                },
-                "Logging": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Logging"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginGroups": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroups"
+                "Metadata": {
+                    "type": "object"
                 },
-                "Origins": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.Origin"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "ModuleName",
+                        "ModulePackage"
+                    ],
+                    "type": "object"
                 },
-                "PriceClass": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleVersion"
+                    ],
                     "type": "string"
                 },
-                "Restrictions": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Restrictions"
-                },
-                "S3Origin": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyS3Origin"
-                },
-                "Staging": {
-                    "type": "boolean"
-                },
-                "ViewerCertificate": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
-                },
-                "WebACLId": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "DefaultCacheBehavior",
-                "Enabled"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.ForwardedValues": {
+        "AWS::CloudFormation::PublicTypeVersion": {
             "additionalProperties": false,
             "properties": {
-                "Cookies": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
-                },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Condition": {
+                    "type": "string"
                 },
-                "QueryString": {
-                    "type": "boolean"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "QueryStringCacheKeys": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "QueryString"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.FunctionAssociation": {
-            "additionalProperties": false,
-            "properties": {
-                "EventType": {
-                    "type": "string"
-                },
-                "FunctionARN": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.GeoRestriction": {
-            "additionalProperties": false,
-            "properties": {
-                "Locations": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "RestrictionType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RestrictionType"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.LambdaFunctionAssociation": {
-            "additionalProperties": false,
-            "properties": {
-                "EventType": {
-                    "type": "string"
-                },
-                "IncludeBody": {
-                    "type": "boolean"
-                },
-                "LambdaFunctionARN": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.LegacyCustomOrigin": {
-            "additionalProperties": false,
-            "properties": {
-                "DNSName": {
-                    "type": "string"
-                },
-                "HTTPPort": {
-                    "type": "number"
-                },
-                "HTTPSPort": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginProtocolPolicy": {
-                    "type": "string"
+                "Metadata": {
+                    "type": "object"
                 },
-                "OriginSSLProtocols": {
-                    "items": {
-                        "type": "string"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "LogDeliveryBucket": {
+                            "type": "string"
+                        },
+                        "PublicVersionNumber": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "DNSName",
-                "OriginProtocolPolicy",
-                "OriginSSLProtocols"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.LegacyS3Origin": {
-            "additionalProperties": false,
-            "properties": {
-                "DNSName": {
-                    "type": "string"
+                    "type": "object"
                 },
-                "OriginAccessIdentity": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "DNSName"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.Logging": {
-            "additionalProperties": false,
-            "properties": {
-                "Bucket": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::PublicTypeVersion"
+                    ],
                     "type": "string"
                 },
-                "IncludeCookies": {
-                    "type": "boolean"
-                },
-                "Prefix": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Origin": {
+        "AWS::CloudFormation::Publisher": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionAttempts": {
-                    "type": "number"
-                },
-                "ConnectionTimeout": {
-                    "type": "number"
-                },
-                "CustomOriginConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
-                },
-                "DomainName": {
-                    "type": "string"
-                },
-                "Id": {
+                "Condition": {
                     "type": "string"
                 },
-                "OriginAccessControlId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "OriginCustomHeaders": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginCustomHeader"
-                    },
-                    "type": "array"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginPath": {
-                    "type": "string"
+                "Metadata": {
+                    "type": "object"
                 },
-                "OriginShield": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginShield"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptTermsAndConditions"
+                    ],
+                    "type": "object"
                 },
-                "S3OriginConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.S3OriginConfig"
-                }
-            },
-            "required": [
-                "DomainName",
-                "Id"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginCustomHeader": {
-            "additionalProperties": false,
-            "properties": {
-                "HeaderName": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Publisher"
+                    ],
                     "type": "string"
                 },
-                "HeaderValue": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "HeaderName",
-                "HeaderValue"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.OriginGroup": {
+        "AWS::CloudFormation::ResourceDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "FailoverCriteria": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
-                },
-                "Id": {
+                "Condition": {
                     "type": "string"
                 },
-                "Members": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMembers"
-                }
-            },
-            "required": [
-                "FailoverCriteria",
-                "Id",
-                "Members"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroupFailoverCriteria": {
-            "additionalProperties": false,
-            "properties": {
-                "StatusCodes": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.StatusCodes"
-                }
-            },
-            "required": [
-                "StatusCodes"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroupMember": {
-            "additionalProperties": false,
-            "properties": {
-                "OriginId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "OriginId"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroupMembers": {
-            "additionalProperties": false,
-            "properties": {
-                "Items": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMember"
-                    },
-                    "type": "array"
                 },
-                "Quantity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Items",
-                "Quantity"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroups": {
-            "additionalProperties": false,
-            "properties": {
-                "Items": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroup"
-                    },
-                    "type": "array"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "Quantity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Quantity"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginShield": {
-            "additionalProperties": false,
-            "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "Metadata": {
+                    "type": "object"
                 },
-                "OriginShieldRegion": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.Restrictions": {
-            "additionalProperties": false,
-            "properties": {
-                "GeoRestriction": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.GeoRestriction"
-                }
-            },
-            "required": [
-                "GeoRestriction"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.S3OriginConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "OriginAccessIdentity": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.StatusCodes": {
-            "additionalProperties": false,
-            "properties": {
-                "Items": {
-                    "items": {
-                        "type": "number"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                },
-                "Quantity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Items",
-                "Quantity"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.ViewerCertificate": {
-            "additionalProperties": false,
-            "properties": {
-                "AcmCertificateArn": {
-                    "type": "string"
-                },
-                "CloudFrontDefaultCertificate": {
-                    "type": "boolean"
-                },
-                "IamCertificateId": {
-                    "type": "string"
+                    "type": "object"
                 },
-                "MinimumProtocolVersion": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
                     "type": "string"
                 },
-                "SslSupportMethod": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFront::Function": {
+        "AWS::CloudFormation::ResourceVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30286,32 +32442,28 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoPublish": {
-                            "type": "boolean"
-                        },
-                        "FunctionCode": {
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "FunctionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
                         },
-                        "FunctionMetadata": {
-                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionMetadata"
+                        "SchemaHandlerPackage": {
+                            "type": "string"
                         },
-                        "Name": {
+                        "TypeName": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "FunctionCode",
-                        "FunctionConfig",
-                        "Name"
+                        "SchemaHandlerPackage",
+                        "TypeName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Function"
+                        "AWS::CloudFormation::ResourceVersion"
                     ],
                     "type": "string"
                 },
@@ -30330,50 +32482,19 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Function.FunctionConfig": {
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "LogGroupName": {
                     "type": "string"
                 },
-                "KeyValueStoreAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Function.KeyValueStoreAssociation"
-                    },
-                    "type": "array"
-                },
-                "Runtime": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comment",
-                "Runtime"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Function.FunctionMetadata": {
-            "additionalProperties": false,
-            "properties": {
-                "FunctionARN": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Function.KeyValueStoreAssociation": {
-            "additionalProperties": false,
-            "properties": {
-                "KeyValueStoreARN": {
+                "LogRoleArn": {
                     "type": "string"
                 }
             },
-            "required": [
-                "KeyValueStoreARN"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::KeyGroup": {
+        "AWS::CloudFormation::Stack": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30408,18 +32529,42 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "KeyGroupConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
+                        "NotificationARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
                         }
                     },
                     "required": [
-                        "KeyGroupConfig"
+                        "TemplateURL"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::KeyGroup"
+                        "AWS::CloudFormation::Stack"
                     ],
                     "type": "string"
                 },
@@ -30438,29 +32583,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::KeyGroup.KeyGroupConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Comment": {
-                    "type": "string"
-                },
-                "Items": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Items",
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::KeyValueStore": {
+        "AWS::CloudFormation::StackSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30495,24 +32618,73 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Comment": {
+                        "AdministrationRoleARN": {
                             "type": "string"
                         },
-                        "ImportSource": {
-                            "$ref": "#/definitions/AWS::CloudFront::KeyValueStore.ImportSource"
+                        "AutoDeployment": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
                         },
-                        "Name": {
+                        "CallAs": {
+                            "type": "string"
+                        },
+                        "Capabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleName": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
+                        },
+                        "OperationPreferences": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionModel": {
+                            "type": "string"
+                        },
+                        "StackInstancesGroup": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                            },
+                            "type": "array"
+                        },
+                        "StackSetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateURL": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Name"
+                        "PermissionModel",
+                        "StackSetName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::KeyValueStore"
+                        "AWS::CloudFormation::StackSet"
                     ],
                     "type": "string"
                 },
@@ -30531,23 +32703,123 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::KeyValueStore.ImportSource": {
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
             "additionalProperties": false,
             "properties": {
-                "SourceArn": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountFilterType": {
                     "type": "string"
                 },
-                "SourceType": {
+                "Accounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AccountsUrl": {
+                    "type": "string"
+                },
+                "OrganizationalUnitIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.ManagedExecution": {
+            "additionalProperties": false,
+            "properties": {
+                "Active": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrencyMode": {
+                    "type": "string"
+                },
+                "FailureToleranceCount": {
+                    "type": "number"
+                },
+                "FailureTolerancePercentage": {
+                    "type": "number"
+                },
+                "MaxConcurrentCount": {
+                    "type": "number"
+                },
+                "MaxConcurrentPercentage": {
+                    "type": "number"
+                },
+                "RegionConcurrencyType": {
+                    "type": "string"
+                },
+                "RegionOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterKey": {
+                    "type": "string"
+                },
+                "ParameterValue": {
                     "type": "string"
                 }
             },
             "required": [
-                "SourceArn",
-                "SourceType"
+                "ParameterKey",
+                "ParameterValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::MonitoringSubscription": {
+        "AWS::CloudFormation::StackSet.StackInstances": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentTargets": {
+                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                },
+                "ParameterOverrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                    },
+                    "type": "array"
+                },
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DeploymentTargets",
+                "Regions"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::TypeActivation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30582,22 +32854,42 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionId": {
+                        "AutoUpdate": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "MonitoringSubscription": {
-                            "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.MonitoringSubscription"
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
+                        },
+                        "MajorVersion": {
+                            "type": "string"
+                        },
+                        "PublicTypeArn": {
+                            "type": "string"
+                        },
+                        "PublisherId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeNameAlias": {
+                            "type": "string"
+                        },
+                        "VersionBump": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DistributionId",
-                        "MonitoringSubscription"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::MonitoringSubscription"
+                        "AWS::CloudFormation::TypeActivation"
                     ],
                     "type": "string"
                 },
@@ -30611,38 +32903,31 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::MonitoringSubscription.MonitoringSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "RealtimeMetricsSubscriptionConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig": {
+        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "RealtimeMetricsSubscriptionStatus": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
                     "type": "string"
                 }
             },
-            "required": [
-                "RealtimeMetricsSubscriptionStatus"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginAccessControl": {
+        "AWS::CloudFormation::WaitCondition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
+                "CreationPolicy": {
+                    "type": "object"
+                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -30672,18 +32957,21 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "OriginAccessControlConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig"
+                        "Count": {
+                            "type": "number"
+                        },
+                        "Handle": {
+                            "type": "string"
+                        },
+                        "Timeout": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "OriginAccessControlConfig"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::OriginAccessControl"
+                        "AWS::CloudFormation::WaitCondition"
                     ],
                     "type": "string"
                 },
@@ -30697,39 +32985,68 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig": {
+        "AWS::CloudFormation::WaitConditionHandle": {
             "additionalProperties": false,
             "properties": {
-                "Description": {
+                "Condition": {
                     "type": "string"
                 },
-                "Name": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "OriginAccessControlOriginType": {
-                    "type": "string"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "SigningBehavior": {
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {},
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitConditionHandle"
+                    ],
                     "type": "string"
                 },
-                "SigningProtocol": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Name",
-                "OriginAccessControlOriginType",
-                "SigningBehavior",
-                "SigningProtocol"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy": {
+        "AWS::CloudFront::CachePolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30764,18 +33081,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "OriginRequestPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        "CachePolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
                         }
                     },
                     "required": [
-                        "OriginRequestPolicyConfig"
+                        "CachePolicyConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::OriginRequestPolicy"
+                        "AWS::CloudFront::CachePolicy"
                     ],
                     "type": "string"
                 },
@@ -30794,7 +33111,38 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
+        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ParametersInCacheKeyAndForwardedToOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                }
+            },
+            "required": [
+                "DefaultTTL",
+                "MaxTTL",
+                "MinTTL",
+                "Name",
+                "ParametersInCacheKeyAndForwardedToOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CookiesConfig": {
             "additionalProperties": false,
             "properties": {
                 "CookieBehavior": {
@@ -30812,7 +33160,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
+        "AWS::CloudFront::CachePolicy.HeadersConfig": {
             "additionalProperties": false,
             "properties": {
                 "HeaderBehavior": {
@@ -30830,34 +33178,34 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
-                },
                 "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
                 },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.HeadersConfig"
+                "EnableAcceptEncodingBrotli": {
+                    "type": "boolean"
                 },
-                "Name": {
-                    "type": "string"
+                "EnableAcceptEncodingGzip": {
+                    "type": "boolean"
+                },
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
                 },
                 "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig"
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
                 }
             },
             "required": [
                 "CookiesConfig",
+                "EnableAcceptEncodingGzip",
                 "HeadersConfig",
-                "Name",
                 "QueryStringsConfig"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
+        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
             "additionalProperties": false,
             "properties": {
                 "QueryStringBehavior": {
@@ -30875,7 +33223,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::PublicKey": {
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30910,18 +33258,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "PublicKeyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
+                        "CloudFrontOriginAccessIdentityConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
                         }
                     },
                     "required": [
-                        "PublicKeyConfig"
+                        "CloudFrontOriginAccessIdentityConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::PublicKey"
+                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
                     ],
                     "type": "string"
                 },
@@ -30940,30 +33288,19 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
             "additionalProperties": false,
             "properties": {
-                "CallerReference": {
-                    "type": "string"
-                },
                 "Comment": {
                     "type": "string"
-                },
-                "EncodedKey": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
                 }
             },
             "required": [
-                "CallerReference",
-                "EncodedKey",
-                "Name"
+                "Comment"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::RealtimeLogConfig": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30998,36 +33335,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EndPoints": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.EndPoint"
-                            },
-                            "type": "array"
-                        },
-                        "Fields": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "SamplingRate": {
-                            "type": "number"
+                        "ContinuousDeploymentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
                         }
                     },
                     "required": [
-                        "EndPoints",
-                        "Fields",
-                        "Name",
-                        "SamplingRate"
+                        "ContinuousDeploymentPolicyConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::RealtimeLogConfig"
+                        "AWS::CloudFront::ContinuousDeploymentPolicy"
                     ],
                     "type": "string"
                 },
@@ -31046,50 +33365,145 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "KinesisStreamConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "StreamType": {
+                "SingleHeaderPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                },
+                "SingleWeightPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                },
+                "StagingDistributionDnsNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrafficConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "KinesisStreamConfig",
-                "StreamType"
+                "Enabled",
+                "StagingDistributionDnsNames"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
             "additionalProperties": false,
             "properties": {
-                "RoleArn": {
-                    "type": "string"
+                "IdleTTL": {
+                    "type": "number"
                 },
-                "StreamArn": {
-                    "type": "string"
+                "MaximumTTL": {
+                    "type": "number"
                 }
             },
             "required": [
-                "RoleArn",
-                "StreamArn"
+                "IdleTTL",
+                "MaximumTTL"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Header": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SingleHeaderConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                },
+                "SingleWeightConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
                 "DependsOn": {
@@ -31113,18 +33527,24 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ResponseHeadersPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
+                        "DistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ResponseHeadersPolicyConfig"
+                        "DistributionConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ResponseHeadersPolicy"
+                        "AWS::CloudFront::Distribution"
                     ],
                     "type": "string"
                 },
@@ -31143,25 +33563,102 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
+        "AWS::CloudFront::Distribution.CacheBehavior": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "PathPattern": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Items"
+                "PathPattern",
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
+        "AWS::CloudFront::Distribution.Cookies": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "Forward": {
+                    "type": "string"
+                },
+                "WhitelistedNames": {
                     "items": {
                         "type": "string"
                     },
@@ -31169,14 +33666,50 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Items"
+                "Forward"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
+        "AWS::CloudFront::Distribution.CustomErrorResponse": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "ErrorCachingMinTTL": {
+                    "type": "number"
+                },
+                "ErrorCode": {
+                    "type": "number"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponsePagePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ErrorCode"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HTTPPort": {
+                    "type": "number"
+                },
+                "HTTPSPort": {
+                    "type": "number"
+                },
+                "OriginKeepaliveTimeout": {
+                    "type": "number"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginReadTimeout": {
+                    "type": "number"
+                },
+                "OriginSSLProtocols": {
                     "items": {
                         "type": "string"
                     },
@@ -31184,295 +33717,531 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Items"
+                "OriginProtocolPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
+        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Items"
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy": {
+        "AWS::CloudFront::Distribution.DistributionConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContentSecurityPolicy": {
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CNAMEs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CacheBehaviors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CacheBehavior"
+                    },
+                    "type": "array"
+                },
+                "Comment": {
                     "type": "string"
                 },
-                "Override": {
+                "ContinuousDeploymentPolicyId": {
+                    "type": "string"
+                },
+                "CustomErrorResponses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomErrorResponse"
+                    },
+                    "type": "array"
+                },
+                "CustomOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyCustomOrigin"
+                },
+                "DefaultCacheBehavior": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.DefaultCacheBehavior"
+                },
+                "DefaultRootObject": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "HttpVersion": {
+                    "type": "string"
+                },
+                "IPV6Enabled": {
+                    "type": "boolean"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Logging"
+                },
+                "OriginGroups": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroups"
+                },
+                "Origins": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.Origin"
+                    },
+                    "type": "array"
+                },
+                "PriceClass": {
+                    "type": "string"
+                },
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Restrictions"
+                },
+                "S3Origin": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyS3Origin"
+                },
+                "Staging": {
                     "type": "boolean"
+                },
+                "ViewerCertificate": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
+                },
+                "WebACLId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ContentSecurityPolicy",
-                "Override"
+                "DefaultCacheBehavior",
+                "Enabled"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
+        "AWS::CloudFront::Distribution.ForwardedValues": {
             "additionalProperties": false,
             "properties": {
-                "Override": {
+                "Cookies": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryString": {
                     "type": "boolean"
+                },
+                "QueryStringCacheKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Override"
+                "QueryString"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
+        "AWS::CloudFront::Distribution.FunctionAssociation": {
             "additionalProperties": false,
             "properties": {
-                "AccessControlAllowCredentials": {
-                    "type": "boolean"
+                "EventType": {
+                    "type": "string"
                 },
-                "AccessControlAllowHeaders": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
+                "FunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.GeoRestriction": {
+            "additionalProperties": false,
+            "properties": {
+                "Locations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "AccessControlAllowMethods": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
+                "RestrictionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RestrictionType"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LambdaFunctionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "EventType": {
+                    "type": "string"
                 },
-                "AccessControlAllowOrigins": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
+                "IncludeBody": {
+                    "type": "boolean"
                 },
-                "AccessControlExposeHeaders": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
+                "LambdaFunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LegacyCustomOrigin": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
                 },
-                "AccessControlMaxAgeSec": {
+                "HTTPPort": {
                     "type": "number"
                 },
-                "OriginOverride": {
-                    "type": "boolean"
+                "HTTPSPort": {
+                    "type": "number"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "AccessControlAllowCredentials",
-                "AccessControlAllowHeaders",
-                "AccessControlAllowMethods",
-                "AccessControlAllowOrigins",
-                "OriginOverride"
+                "DNSName",
+                "OriginProtocolPolicy",
+                "OriginSSLProtocols"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
+        "AWS::CloudFront::Distribution.LegacyS3Origin": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "DNSName": {
                     "type": "string"
                 },
-                "Override": {
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "IncludeCookies": {
                     "type": "boolean"
                 },
-                "Value": {
+                "Prefix": {
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Override",
-                "Value"
+                "Bucket"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig": {
+        "AWS::CloudFront::Distribution.Origin": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "ConnectionAttempts": {
+                    "type": "number"
+                },
+                "ConnectionTimeout": {
+                    "type": "number"
+                },
+                "CustomOriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "OriginAccessControlId": {
+                    "type": "string"
+                },
+                "OriginCustomHeaders": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeader"
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginCustomHeader"
                     },
                     "type": "array"
+                },
+                "OriginPath": {
+                    "type": "string"
+                },
+                "OriginShield": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginShield"
+                },
+                "S3OriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.S3OriginConfig"
                 }
             },
             "required": [
-                "Items"
+                "DomainName",
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
+        "AWS::CloudFront::Distribution.OriginCustomHeader": {
             "additionalProperties": false,
             "properties": {
-                "FrameOption": {
+                "HeaderName": {
                     "type": "string"
                 },
-                "Override": {
-                    "type": "boolean"
+                "HeaderValue": {
+                    "type": "string"
                 }
             },
             "required": [
-                "FrameOption",
-                "Override"
+                "HeaderName",
+                "HeaderValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
+        "AWS::CloudFront::Distribution.OriginGroup": {
             "additionalProperties": false,
             "properties": {
-                "Override": {
-                    "type": "boolean"
+                "FailoverCriteria": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
                 },
-                "ReferrerPolicy": {
+                "Id": {
                     "type": "string"
+                },
+                "Members": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMembers"
                 }
             },
             "required": [
-                "Override",
-                "ReferrerPolicy"
+                "FailoverCriteria",
+                "Id",
+                "Members"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader": {
+        "AWS::CloudFront::Distribution.OriginGroupFailoverCriteria": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "StatusCodes": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.StatusCodes"
+                }
+            },
+            "required": [
+                "StatusCodes"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "OriginId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Header"
+                "OriginId"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig": {
+        "AWS::CloudFront::Distribution.OriginGroupMembers": {
             "additionalProperties": false,
             "properties": {
                 "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader"
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMember"
                     },
                     "type": "array"
+                },
+                "Quantity": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Items"
+                "Items",
+                "Quantity"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+        "AWS::CloudFront::Distribution.OriginGroups": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
-                },
-                "CorsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
-                },
-                "CustomHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "RemoveHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig"
-                },
-                "SecurityHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                "Items": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroup"
+                    },
+                    "type": "array"
                 },
-                "ServerTimingHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig"
+                "Quantity": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Name"
+                "Quantity"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig": {
+        "AWS::CloudFront::Distribution.OriginShield": {
             "additionalProperties": false,
             "properties": {
-                "ContentSecurityPolicy": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy"
-                },
-                "ContentTypeOptions": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions"
-                },
-                "FrameOptions": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.FrameOptions"
-                },
-                "ReferrerPolicy": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy"
-                },
-                "StrictTransportSecurity": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "XSSProtection": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.XSSProtection"
+                "OriginShieldRegion": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig": {
+        "AWS::CloudFront::Distribution.Restrictions": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "SamplingRate": {
-                    "type": "number"
+                "GeoRestriction": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.GeoRestriction"
                 }
             },
             "required": [
-                "Enabled"
+                "GeoRestriction"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity": {
+        "AWS::CloudFront::Distribution.S3OriginConfig": {
             "additionalProperties": false,
             "properties": {
-                "AccessControlMaxAgeSec": {
-                    "type": "number"
-                },
-                "IncludeSubdomains": {
-                    "type": "boolean"
-                },
-                "Override": {
-                    "type": "boolean"
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.StatusCodes": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
                 },
-                "Preload": {
-                    "type": "boolean"
+                "Quantity": {
+                    "type": "number"
                 }
             },
             "required": [
-                "AccessControlMaxAgeSec",
-                "Override"
+                "Items",
+                "Quantity"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.XSSProtection": {
+        "AWS::CloudFront::Distribution.ViewerCertificate": {
             "additionalProperties": false,
             "properties": {
-                "ModeBlock": {
-                    "type": "boolean"
+                "AcmCertificateArn": {
+                    "type": "string"
                 },
-                "Override": {
+                "CloudFrontDefaultCertificate": {
                     "type": "boolean"
                 },
-                "Protection": {
-                    "type": "boolean"
+                "IamCertificateId": {
+                    "type": "string"
                 },
-                "ReportUri": {
+                "MinimumProtocolVersion": {
+                    "type": "string"
+                },
+                "SslSupportMethod": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Override",
-                "Protection"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution": {
+        "AWS::CloudFront::Function": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31507,25 +34276,32 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "StreamingDistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
+                        "AutoPublish": {
+                            "type": "boolean"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "FunctionCode": {
+                            "type": "string"
+                        },
+                        "FunctionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        },
+                        "FunctionMetadata": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionMetadata"
+                        },
+                        "Name": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "StreamingDistributionConfig",
-                        "Tags"
+                        "FunctionCode",
+                        "FunctionConfig",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::StreamingDistribution"
+                        "AWS::CloudFront::Function"
                     ],
                     "type": "string"
                 },
@@ -31544,97 +34320,50 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution.Logging": {
+        "AWS::CloudFront::Function.FunctionConfig": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "Comment": {
                     "type": "string"
                 },
-                "Enabled": {
-                    "type": "boolean"
+                "KeyValueStoreAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Function.KeyValueStoreAssociation"
+                    },
+                    "type": "array"
                 },
-                "Prefix": {
+                "Runtime": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "Enabled",
-                "Prefix"
+                "Comment",
+                "Runtime"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution.S3Origin": {
+        "AWS::CloudFront::Function.FunctionMetadata": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "OriginAccessIdentity": {
+                "FunctionARN": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DomainName",
-                "OriginAccessIdentity"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig": {
+        "AWS::CloudFront::Function.KeyValueStoreAssociation": {
             "additionalProperties": false,
             "properties": {
-                "Aliases": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Comment": {
-                    "type": "string"
-                },
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "Logging": {
-                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.Logging"
-                },
-                "PriceClass": {
+                "KeyValueStoreARN": {
                     "type": "string"
-                },
-                "S3Origin": {
-                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.S3Origin"
-                },
-                "TrustedSigners": {
-                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.TrustedSigners"
-                }
-            },
-            "required": [
-                "Comment",
-                "Enabled",
-                "S3Origin",
-                "TrustedSigners"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::StreamingDistribution.TrustedSigners": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountNumbers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Enabled": {
-                    "type": "boolean"
                 }
             },
             "required": [
-                "Enabled"
+                "KeyValueStoreARN"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Channel": {
+        "AWS::CloudFront::KeyGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31669,30 +34398,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Channel.Destination"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Source": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "KeyGroupConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
                         }
                     },
+                    "required": [
+                        "KeyGroupConfig"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::Channel"
+                        "AWS::CloudFront::KeyGroup"
                     ],
                     "type": "string"
                 },
@@ -31706,27 +34423,34 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Channel.Destination": {
+        "AWS::CloudFront::KeyGroup.KeyGroupConfig": {
             "additionalProperties": false,
             "properties": {
-                "Location": {
+                "Comment": {
                     "type": "string"
                 },
-                "Type": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 }
             },
             "required": [
-                "Location",
-                "Type"
+                "Items",
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::EventDataStore": {
+        "AWS::CloudFront::KeyValueStore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31761,63 +34485,24 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdvancedEventSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedEventSelector"
-                            },
-                            "type": "array"
-                        },
-                        "BillingMode": {
-                            "type": "string"
-                        },
-                        "FederationEnabled": {
-                            "type": "boolean"
-                        },
-                        "FederationRoleArn": {
-                            "type": "string"
-                        },
-                        "IngestionEnabled": {
-                            "type": "boolean"
-                        },
-                        "InsightSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.InsightSelector"
-                            },
-                            "type": "array"
-                        },
-                        "InsightsDestination": {
-                            "type": "string"
-                        },
-                        "KmsKeyId": {
+                        "Comment": {
                             "type": "string"
                         },
-                        "MultiRegionEnabled": {
-                            "type": "boolean"
+                        "ImportSource": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyValueStore.ImportSource"
                         },
                         "Name": {
                             "type": "string"
-                        },
-                        "OrganizationEnabled": {
-                            "type": "boolean"
-                        },
-                        "RetentionPeriod": {
-                            "type": "number"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "TerminationProtectionEnabled": {
-                            "type": "boolean"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::EventDataStore"
+                        "AWS::CloudFront::KeyValueStore"
                     ],
                     "type": "string"
                 },
@@ -31831,86 +34516,28 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::EventDataStore.AdvancedEventSelector": {
+        "AWS::CloudFront::KeyValueStore.ImportSource": {
             "additionalProperties": false,
             "properties": {
-                "FieldSelectors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedFieldSelector"
-                    },
-                    "type": "array"
-                },
-                "Name": {
+                "SourceArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "FieldSelectors"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudTrail::EventDataStore.AdvancedFieldSelector": {
-            "additionalProperties": false,
-            "properties": {
-                "EndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Equals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 },
-                "Field": {
+                "SourceType": {
                     "type": "string"
-                },
-                "NotEndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "NotEquals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "NotStartsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "StartsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
             "required": [
-                "Field"
+                "SourceArn",
+                "SourceType"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::EventDataStore.InsightSelector": {
-            "additionalProperties": false,
-            "properties": {
-                "InsightType": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudTrail::ResourcePolicy": {
+        "AWS::CloudFront::MonitoringSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31945,22 +34572,22 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ResourceArn": {
+                        "DistributionId": {
                             "type": "string"
                         },
-                        "ResourcePolicy": {
-                            "type": "object"
+                        "MonitoringSubscription": {
+                            "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.MonitoringSubscription"
                         }
                     },
                     "required": [
-                        "ResourceArn",
-                        "ResourcePolicy"
+                        "DistributionId",
+                        "MonitoringSubscription"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::ResourcePolicy"
+                        "AWS::CloudFront::MonitoringSubscription"
                     ],
                     "type": "string"
                 },
@@ -31979,16 +34606,37 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail": {
+        "AWS::CloudFront::MonitoringSubscription.MonitoringSubscription": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
+                "RealtimeMetricsSubscriptionConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RealtimeMetricsSubscriptionStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RealtimeMetricsSubscriptionStatus"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginAccessControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
                         "Snapshot"
                     ],
                     "type": "string"
@@ -32014,76 +34662,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdvancedEventSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedEventSelector"
-                            },
-                            "type": "array"
-                        },
-                        "CloudWatchLogsLogGroupArn": {
-                            "type": "string"
-                        },
-                        "CloudWatchLogsRoleArn": {
-                            "type": "string"
-                        },
-                        "EnableLogFileValidation": {
-                            "type": "boolean"
-                        },
-                        "EventSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Trail.EventSelector"
-                            },
-                            "type": "array"
-                        },
-                        "IncludeGlobalServiceEvents": {
-                            "type": "boolean"
-                        },
-                        "InsightSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Trail.InsightSelector"
-                            },
-                            "type": "array"
-                        },
-                        "IsLogging": {
-                            "type": "boolean"
-                        },
-                        "IsMultiRegionTrail": {
-                            "type": "boolean"
-                        },
-                        "IsOrganizationTrail": {
-                            "type": "boolean"
-                        },
-                        "KMSKeyId": {
-                            "type": "string"
-                        },
-                        "S3BucketName": {
-                            "type": "string"
-                        },
-                        "S3KeyPrefix": {
-                            "type": "string"
-                        },
-                        "SnsTopicName": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "TrailName": {
-                            "type": "string"
+                        "OriginAccessControlConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig"
                         }
                     },
                     "required": [
-                        "IsLogging",
-                        "S3BucketName"
+                        "OriginAccessControlConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::Trail"
+                        "AWS::CloudFront::OriginAccessControl"
                     ],
                     "type": "string"
                 },
@@ -32102,79 +34692,105 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.AdvancedEventSelector": {
+        "AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig": {
             "additionalProperties": false,
             "properties": {
-                "FieldSelectors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedFieldSelector"
-                    },
-                    "type": "array"
+                "Description": {
+                    "type": "string"
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OriginAccessControlOriginType": {
+                    "type": "string"
+                },
+                "SigningBehavior": {
+                    "type": "string"
+                },
+                "SigningProtocol": {
+                    "type": "string"
                 }
             },
             "required": [
-                "FieldSelectors"
+                "Name",
+                "OriginAccessControlOriginType",
+                "SigningBehavior",
+                "SigningProtocol"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.AdvancedFieldSelector": {
+        "AWS::CloudFront::OriginRequestPolicy": {
             "additionalProperties": false,
             "properties": {
-                "EndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Equals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Condition": {
+                    "type": "string"
                 },
-                "Field": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "NotEndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "NotEquals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "NotStartsWith": {
-                    "items": {
-                        "type": "string"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "OriginRequestPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "OriginRequestPolicyConfig"
+                    ],
+                    "type": "object"
                 },
-                "StartsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::OriginRequestPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "Field"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.DataResource": {
+        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "CookieBehavior": {
                     "type": "string"
                 },
-                "Values": {
+                "Cookies": {
                     "items": {
                         "type": "string"
                     },
@@ -32182,44 +34798,74 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "CookieBehavior"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.EventSelector": {
+        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
             "additionalProperties": false,
             "properties": {
-                "DataResources": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudTrail::Trail.DataResource"
-                    },
-                    "type": "array"
+                "HeaderBehavior": {
+                    "type": "string"
                 },
-                "ExcludeManagementEventSources": {
+                "Headers": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
                 },
-                "IncludeManagementEvents": {
-                    "type": "boolean"
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
                 },
-                "ReadWriteType": {
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.HeadersConfig"
+                },
+                "Name": {
                     "type": "string"
+                },
+                "QueryStringsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig"
                 }
             },
+            "required": [
+                "CookiesConfig",
+                "HeadersConfig",
+                "Name",
+                "QueryStringsConfig"
+            ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.InsightSelector": {
+        "AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
             "additionalProperties": false,
             "properties": {
-                "InsightType": {
+                "QueryStringBehavior": {
                     "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "QueryStringBehavior"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm": {
+        "AWS::CloudFront::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32254,100 +34900,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionsEnabled": {
-                            "type": "boolean"
-                        },
-                        "AlarmActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AlarmDescription": {
-                            "type": "string"
-                        },
-                        "AlarmName": {
-                            "type": "string"
-                        },
-                        "ComparisonOperator": {
-                            "type": "string"
-                        },
-                        "DatapointsToAlarm": {
-                            "type": "number"
-                        },
-                        "Dimensions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
-                            },
-                            "type": "array"
-                        },
-                        "EvaluateLowSampleCountPercentile": {
-                            "type": "string"
-                        },
-                        "EvaluationPeriods": {
-                            "type": "number"
-                        },
-                        "ExtendedStatistic": {
-                            "type": "string"
-                        },
-                        "InsufficientDataActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "MetricName": {
-                            "type": "string"
-                        },
-                        "Metrics": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricDataQuery"
-                            },
-                            "type": "array"
-                        },
-                        "Namespace": {
-                            "type": "string"
-                        },
-                        "OKActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Period": {
-                            "type": "number"
-                        },
-                        "Statistic": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdMetricId": {
-                            "type": "string"
-                        },
-                        "TreatMissingData": {
-                            "type": "string"
-                        },
-                        "Unit": {
-                            "type": "string"
+                        "PublicKeyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
                         }
                     },
                     "required": [
-                        "ComparisonOperator",
-                        "EvaluationPeriods"
+                        "PublicKeyConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::Alarm"
+                        "AWS::CloudFront::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -32366,94 +34930,145 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.Dimension": {
+        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "CallerReference": {
                     "type": "string"
                 },
-                "Value": {
+                "Comment": {
+                    "type": "string"
+                },
+                "EncodedKey": {
+                    "type": "string"
+                },
+                "Name": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name",
-                "Value"
+                "CallerReference",
+                "EncodedKey",
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.Metric": {
+        "AWS::CloudFront::RealtimeLogConfig": {
             "additionalProperties": false,
             "properties": {
-                "Dimensions": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
+                "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": {
+                        "EndPoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.EndPoint"
+                            },
+                            "type": "array"
+                        },
+                        "Fields": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SamplingRate": {
+                            "type": "number"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "EndPoints",
+                        "Fields",
+                        "Name",
+                        "SamplingRate"
+                    ],
+                    "type": "object"
                 },
-                "MetricName": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::RealtimeLogConfig"
+                    ],
                     "type": "string"
                 },
-                "Namespace": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.MetricDataQuery": {
+        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
-                    "type": "string"
-                },
-                "Expression": {
-                    "type": "string"
-                },
-                "Id": {
-                    "type": "string"
+                "KinesisStreamConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
                 },
-                "Label": {
+                "StreamType": {
                     "type": "string"
-                },
-                "MetricStat": {
-                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricStat"
-                },
-                "Period": {
-                    "type": "number"
-                },
-                "ReturnData": {
-                    "type": "boolean"
                 }
             },
             "required": [
-                "Id"
+                "KinesisStreamConfig",
+                "StreamType"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.MetricStat": {
+        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
             "additionalProperties": false,
             "properties": {
-                "Metric": {
-                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.Metric"
-                },
-                "Period": {
-                    "type": "number"
-                },
-                "Stat": {
+                "RoleArn": {
                     "type": "string"
                 },
-                "Unit": {
+                "StreamArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "Metric",
-                "Period",
-                "Stat"
+                "RoleArn",
+                "StreamArn"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector": {
+        "AWS::CloudFront::ResponseHeadersPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32488,39 +35103,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
-                        },
-                        "Dimensions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
-                            },
-                            "type": "array"
-                        },
-                        "MetricCharacteristics": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricCharacteristics"
-                        },
-                        "MetricMathAnomalyDetector": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
-                        },
-                        "MetricName": {
-                            "type": "string"
-                        },
-                        "Namespace": {
-                            "type": "string"
-                        },
-                        "SingleMetricAnomalyDetector": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
-                        },
-                        "Stat": {
-                            "type": "string"
+                        "ResponseHeadersPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
                         }
                     },
+                    "required": [
+                        "ResponseHeadersPolicyConfig"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::AnomalyDetector"
+                        "AWS::CloudFront::ResponseHeadersPolicy"
                     ],
                     "type": "string"
                 },
@@ -32534,183 +35128,341 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Configuration": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
             "additionalProperties": false,
             "properties": {
-                "ExcludedTimeRanges": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Range"
+                        "type": "string"
                     },
                     "type": "array"
-                },
-                "MetricTimeZone": {
-                    "type": "string"
                 }
             },
+            "required": [
+                "Items"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Dimension": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name",
-                "Value"
+                "Items"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Metric": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
             "additionalProperties": false,
             "properties": {
-                "Dimensions": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                        "type": "string"
                     },
                     "type": "array"
-                },
-                "MetricName": {
-                    "type": "string"
-                },
-                "Namespace": {
-                    "type": "string"
                 }
             },
             "required": [
-                "MetricName",
-                "Namespace"
+                "Items"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricCharacteristics": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
             "additionalProperties": false,
             "properties": {
-                "PeriodicSpikes": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentSecurityPolicy": {
+                    "type": "string"
+                },
+                "Override": {
                     "type": "boolean"
                 }
             },
+            "required": [
+                "ContentSecurityPolicy",
+                "Override"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+        "AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
             "additionalProperties": false,
-            "properties": {},
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Override"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
-                    "type": "string"
+                "AccessControlAllowCredentials": {
+                    "type": "boolean"
                 },
-                "Expression": {
-                    "type": "string"
+                "AccessControlAllowHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
                 },
-                "Id": {
-                    "type": "string"
+                "AccessControlAllowMethods": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
                 },
-                "Label": {
-                    "type": "string"
+                "AccessControlAllowOrigins": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
                 },
-                "MetricStat": {
-                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                "AccessControlExposeHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
                 },
-                "Period": {
+                "AccessControlMaxAgeSec": {
                     "type": "number"
                 },
-                "ReturnData": {
+                "OriginOverride": {
                     "type": "boolean"
                 }
             },
             "required": [
-                "Id"
+                "AccessControlAllowCredentials",
+                "AccessControlAllowHeaders",
+                "AccessControlAllowMethods",
+                "AccessControlAllowOrigins",
+                "OriginOverride"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector": {
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
             "additionalProperties": false,
             "properties": {
-                "MetricDataQueries": {
+                "Header": {
+                    "type": "string"
+                },
+                "Override": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Override",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricDataQuery"
+                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeader"
                     },
                     "type": "array"
                 }
             },
+            "required": [
+                "Items"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricStat": {
+        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
             "additionalProperties": false,
             "properties": {
-                "Metric": {
-                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Metric"
-                },
-                "Period": {
-                    "type": "number"
-                },
-                "Stat": {
+                "FrameOption": {
                     "type": "string"
                 },
-                "Unit": {
-                    "type": "string"
+                "Override": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Metric",
-                "Period",
-                "Stat"
+                "FrameOption",
+                "Override"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Range": {
+        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
-                    "type": "string"
+                "Override": {
+                    "type": "boolean"
                 },
-                "StartTime": {
+                "ReferrerPolicy": {
                     "type": "string"
                 }
             },
             "required": [
-                "EndTime",
-                "StartTime"
+                "Override",
+                "ReferrerPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
+        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "Header": {
                     "type": "string"
-                },
-                "Dimensions": {
+                }
+            },
+            "required": [
+                "Header"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader"
                     },
                     "type": "array"
-                },
-                "MetricName": {
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
                     "type": "string"
                 },
-                "Namespace": {
+                "CorsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
+                },
+                "CustomHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Stat": {
+                "RemoveHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig"
+                },
+                "SecurityHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                },
+                "ServerTimingHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentSecurityPolicy": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy"
+                },
+                "ContentTypeOptions": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions"
+                },
+                "FrameOptions": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.FrameOptions"
+                },
+                "ReferrerPolicy": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy"
+                },
+                "StrictTransportSecurity": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity"
+                },
+                "XSSProtection": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.XSSProtection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SamplingRate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlMaxAgeSec": {
+                    "type": "number"
+                },
+                "IncludeSubdomains": {
+                    "type": "boolean"
+                },
+                "Override": {
+                    "type": "boolean"
+                },
+                "Preload": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AccessControlMaxAgeSec",
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.XSSProtection": {
+            "additionalProperties": false,
+            "properties": {
+                "ModeBlock": {
+                    "type": "boolean"
+                },
+                "Override": {
+                    "type": "boolean"
+                },
+                "Protection": {
+                    "type": "boolean"
+                },
+                "ReportUri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Override",
+                "Protection"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::CompositeAlarm": {
+        "AWS::CloudFront::StreamingDistribution": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32745,44 +35497,8 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ActionsSuppressor": {
-                            "type": "string"
-                        },
-                        "ActionsSuppressorExtensionPeriod": {
-                            "type": "number"
-                        },
-                        "ActionsSuppressorWaitPeriod": {
-                            "type": "number"
-                        },
-                        "AlarmActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AlarmDescription": {
-                            "type": "string"
-                        },
-                        "AlarmName": {
-                            "type": "string"
-                        },
-                        "AlarmRule": {
-                            "type": "string"
-                        },
-                        "InsufficientDataActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "OKActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "StreamingDistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
                         },
                         "Tags": {
                             "items": {
@@ -32792,13 +35508,14 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "AlarmRule"
+                        "StreamingDistributionConfig",
+                        "Tags"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::CompositeAlarm"
+                        "AWS::CloudFront::StreamingDistribution"
                     ],
                     "type": "string"
                 },
@@ -32817,7 +35534,97 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Dashboard": {
+        "AWS::CloudFront::StreamingDistribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Enabled",
+                "Prefix"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::StreamingDistribution.S3Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName",
+                "OriginAccessIdentity"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.Logging"
+                },
+                "PriceClass": {
+                    "type": "string"
+                },
+                "S3Origin": {
+                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.S3Origin"
+                },
+                "TrustedSigners": {
+                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.TrustedSigners"
+                }
+            },
+            "required": [
+                "Comment",
+                "Enabled",
+                "S3Origin",
+                "TrustedSigners"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::StreamingDistribution.TrustedSigners": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccountNumbers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::Channel": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32852,21 +35659,30 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DashboardBody": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::Channel.Destination"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "DashboardName": {
+                        "Source": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
-                    "required": [
-                        "DashboardBody"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::Dashboard"
+                        "AWS::CloudTrail::Channel"
                     ],
                     "type": "string"
                 },
@@ -32880,12 +35696,27 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::InsightRule": {
+        "AWS::CloudTrail::Channel.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Location",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32920,29 +35751,206 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "RuleBody": {
-                            "type": "string"
+                        "AdvancedEventSelectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedEventSelector"
+                            },
+                            "type": "array"
                         },
-                        "RuleName": {
+                        "BillingMode": {
                             "type": "string"
                         },
-                        "RuleState": {
+                        "FederationEnabled": {
+                            "type": "boolean"
+                        },
+                        "FederationRoleArn": {
+                            "type": "string"
+                        },
+                        "IngestionEnabled": {
+                            "type": "boolean"
+                        },
+                        "InsightSelectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.InsightSelector"
+                            },
+                            "type": "array"
+                        },
+                        "InsightsDestination": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiRegionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Name": {
                             "type": "string"
                         },
+                        "OrganizationEnabled": {
+                            "type": "boolean"
+                        },
+                        "RetentionPeriod": {
+                            "type": "number"
+                        },
                         "Tags": {
-                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule.Tags"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TerminationProtectionEnabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudTrail::EventDataStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore.AdvancedEventSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedFieldSelector"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldSelectors"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore.AdvancedFieldSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "EndsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Equals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "NotEndsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotEquals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotStartsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StartsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Field"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore.InsightSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudTrail::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "RuleBody",
-                        "RuleName",
-                        "RuleState"
+                        "ResourceArn",
+                        "ResourcePolicy"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::InsightRule"
+                        "AWS::CloudTrail::ResourcePolicy"
                     ],
                     "type": "string"
                 },
@@ -32961,12 +35969,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::InsightRule.Tags": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
-        "AWS::CloudWatch::MetricStream": {
+        "AWS::CloudTrail::Trail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33001,56 +36004,76 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExcludeFilters": {
+                        "AdvancedEventSelectors": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                                "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedEventSelector"
                             },
                             "type": "array"
                         },
-                        "FirehoseArn": {
+                        "CloudWatchLogsLogGroupArn": {
                             "type": "string"
                         },
-                        "IncludeFilters": {
+                        "CloudWatchLogsRoleArn": {
+                            "type": "string"
+                        },
+                        "EnableLogFileValidation": {
+                            "type": "boolean"
+                        },
+                        "EventSelectors": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                                "$ref": "#/definitions/AWS::CloudTrail::Trail.EventSelector"
                             },
                             "type": "array"
                         },
-                        "IncludeLinkedAccountsMetrics": {
+                        "IncludeGlobalServiceEvents": {
                             "type": "boolean"
                         },
-                        "Name": {
+                        "InsightSelectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::Trail.InsightSelector"
+                            },
+                            "type": "array"
+                        },
+                        "IsLogging": {
+                            "type": "boolean"
+                        },
+                        "IsMultiRegionTrail": {
+                            "type": "boolean"
+                        },
+                        "IsOrganizationTrail": {
+                            "type": "boolean"
+                        },
+                        "KMSKeyId": {
                             "type": "string"
                         },
-                        "OutputFormat": {
+                        "S3BucketName": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "S3KeyPrefix": {
                             "type": "string"
                         },
-                        "StatisticsConfigurations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration"
-                            },
-                            "type": "array"
+                        "SnsTopicName": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TrailName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "FirehoseArn",
-                        "OutputFormat",
-                        "RoleArn"
+                        "IsLogging",
+                        "S3BucketName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::MetricStream"
+                        "AWS::CloudTrail::Trail"
                     ],
                     "type": "string"
                 },
@@ -33069,63 +36092,124 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
+        "AWS::CloudTrail::Trail.AdvancedEventSelector": {
             "additionalProperties": false,
             "properties": {
-                "MetricNames": {
+                "FieldSelectors": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedFieldSelector"
                     },
                     "type": "array"
                 },
-                "Namespace": {
+                "Name": {
                     "type": "string"
                 }
             },
             "required": [
-                "Namespace"
+                "FieldSelectors"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration": {
+        "AWS::CloudTrail::Trail.AdvancedFieldSelector": {
             "additionalProperties": false,
             "properties": {
-                "AdditionalStatistics": {
+                "EndsWith": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "IncludeMetrics": {
+                "Equals": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "NotEndsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotEquals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotStartsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StartsWith": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "AdditionalStatistics",
-                "IncludeMetrics"
+                "Field"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric": {
+        "AWS::CloudTrail::Trail.DataResource": {
             "additionalProperties": false,
             "properties": {
-                "MetricName": {
+                "Type": {
                     "type": "string"
                 },
-                "Namespace": {
-                    "type": "string"
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "MetricName",
-                "Namespace"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::Domain": {
+        "AWS::CloudTrail::Trail.EventSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "DataResources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudTrail::Trail.DataResource"
+                    },
+                    "type": "array"
+                },
+                "ExcludeManagementEventSources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeManagementEvents": {
+                    "type": "boolean"
+                },
+                "ReadWriteType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudTrail::Trail.InsightSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33160,30 +36244,100 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DomainName": {
+                        "ActionsEnabled": {
+                            "type": "boolean"
+                        },
+                        "AlarmActions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AlarmDescription": {
                             "type": "string"
                         },
-                        "EncryptionKey": {
+                        "AlarmName": {
                             "type": "string"
                         },
-                        "PermissionsPolicyDocument": {
-                            "type": "object"
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
+                            },
+                            "type": "array"
+                        },
+                        "EvaluateLowSampleCountPercentile": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "ExtendedStatistic": {
+                            "type": "string"
+                        },
+                        "InsufficientDataActions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Metrics": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricDataQuery"
+                            },
+                            "type": "array"
+                        },
+                        "Namespace": {
+                            "type": "string"
+                        },
+                        "OKActions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdMetricId": {
+                            "type": "string"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        },
+                        "Unit": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "ComparisonOperator",
+                        "EvaluationPeriods"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeArtifact::Domain"
+                        "AWS::CloudWatch::Alarm"
                     ],
                     "type": "string"
                 },
@@ -33202,7 +36356,94 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup": {
+        "AWS::CloudWatch::Alarm.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm.MetricStat": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33237,40 +36478,39 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContactInfo": {
-                            "type": "string"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
                         },
-                        "Description": {
-                            "type": "string"
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                            },
+                            "type": "array"
                         },
-                        "DomainName": {
+                        "MetricCharacteristics": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricCharacteristics"
+                        },
+                        "MetricMathAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
+                        },
+                        "MetricName": {
                             "type": "string"
                         },
-                        "DomainOwner": {
+                        "Namespace": {
                             "type": "string"
                         },
-                        "OriginConfiguration": {
-                            "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.OriginConfiguration"
+                        "SingleMetricAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
                         },
-                        "Pattern": {
+                        "Stat": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
-                    "required": [
-                        "DomainName",
-                        "Pattern"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeArtifact::PackageGroup"
+                        "AWS::CloudWatch::AnomalyDetector"
                     ],
                     "type": "string"
                 },
@@ -33284,57 +36524,183 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup.OriginConfiguration": {
+        "AWS::CloudWatch::AnomalyDetector.Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Restrictions": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.Restrictions"
+                "ExcludedTimeRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Range"
+                    },
+                    "type": "array"
+                },
+                "MetricTimeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Restrictions"
+                "Name",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup.RestrictionType": {
+        "AWS::CloudWatch::AnomalyDetector.Metric": {
             "additionalProperties": false,
             "properties": {
-                "Repositories": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
                     },
                     "type": "array"
                 },
-                "RestrictionMode": {
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
                     "type": "string"
                 }
             },
             "required": [
-                "RestrictionMode"
+                "MetricName",
+                "Namespace"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup.Restrictions": {
+        "AWS::CloudWatch::AnomalyDetector.MetricCharacteristics": {
             "additionalProperties": false,
             "properties": {
-                "ExternalUpstream": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                "PeriodicSpikes": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
                 },
-                "InternalUpstream": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                "Expression": {
+                    "type": "string"
                 },
-                "Publish": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
+            "required": [
+                "Id"
+            ],
             "type": "object"
         },
-        "AWS::CodeArtifact::Repository": {
+        "AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricStat": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Range": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndTime",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Stat": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::CompositeAlarm": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33369,49 +36735,60 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "ActionsEnabled": {
+                            "type": "boolean"
                         },
-                        "DomainName": {
+                        "ActionsSuppressor": {
                             "type": "string"
                         },
-                        "DomainOwner": {
-                            "type": "string"
+                        "ActionsSuppressorExtensionPeriod": {
+                            "type": "number"
                         },
-                        "ExternalConnections": {
+                        "ActionsSuppressorWaitPeriod": {
+                            "type": "number"
+                        },
+                        "AlarmActions": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "PermissionsPolicyDocument": {
-                            "type": "object"
+                        "AlarmDescription": {
+                            "type": "string"
                         },
-                        "RepositoryName": {
+                        "AlarmName": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "AlarmRule": {
+                            "type": "string"
+                        },
+                        "InsufficientDataActions": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "Upstreams": {
+                        "OKActions": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DomainName",
-                        "RepositoryName"
+                        "AlarmRule"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeArtifact::Repository"
+                        "AWS::CloudWatch::CompositeAlarm"
                     ],
                     "type": "string"
                 },
@@ -33430,7 +36807,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Fleet": {
+        "AWS::CloudWatch::Dashboard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33465,30 +36842,21 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BaseCapacity": {
-                            "type": "number"
-                        },
-                        "ComputeType": {
-                            "type": "string"
-                        },
-                        "EnvironmentType": {
+                        "DashboardBody": {
                             "type": "string"
                         },
-                        "Name": {
+                        "DashboardName": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DashboardBody"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeBuild::Fleet"
+                        "AWS::CloudWatch::Dashboard"
                     ],
                     "type": "string"
                 },
@@ -33502,11 +36870,12 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project": {
+        "AWS::CloudWatch::InsightRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33541,105 +36910,137 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Artifacts": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
-                        },
-                        "BadgeEnabled": {
-                            "type": "boolean"
-                        },
-                        "BuildBatchConfig": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectBuildBatchConfig"
-                        },
-                        "Cache": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectCache"
-                        },
-                        "ConcurrentBuildLimit": {
-                            "type": "number"
-                        },
-                        "Description": {
+                        "RuleBody": {
                             "type": "string"
                         },
-                        "EncryptionKey": {
+                        "RuleName": {
                             "type": "string"
                         },
-                        "Environment": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.Environment"
-                        },
-                        "FileSystemLocations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectFileSystemLocation"
-                            },
-                            "type": "array"
-                        },
-                        "LogsConfig": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.LogsConfig"
-                        },
-                        "Name": {
+                        "RuleState": {
                             "type": "string"
                         },
-                        "QueuedTimeoutInMinutes": {
-                            "type": "number"
-                        },
-                        "ResourceAccessRole": {
+                        "Tags": {
+                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule.Tags"
+                        }
+                    },
+                    "required": [
+                        "RuleBody",
+                        "RuleName",
+                        "RuleState"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::InsightRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::InsightRule.Tags": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::MetricStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SecondaryArtifacts": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
-                        },
-                        "SecondarySourceVersions": {
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludeFilters": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectSourceVersion"
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
                             },
                             "type": "array"
                         },
-                        "SecondarySources": {
+                        "FirehoseArn": {
+                            "type": "string"
+                        },
+                        "IncludeFilters": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
                             },
                             "type": "array"
                         },
-                        "ServiceRole": {
+                        "IncludeLinkedAccountsMetrics": {
+                            "type": "boolean"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                        "OutputFormat": {
+                            "type": "string"
                         },
-                        "SourceVersion": {
+                        "RoleArn": {
                             "type": "string"
                         },
+                        "StatisticsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TimeoutInMinutes": {
-                            "type": "number"
-                        },
-                        "Triggers": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectTriggers"
-                        },
-                        "Visibility": {
-                            "type": "string"
-                        },
-                        "VpcConfig": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.VpcConfig"
                         }
                     },
                     "required": [
-                        "Artifacts",
-                        "Environment",
-                        "ServiceRole",
-                        "Source"
+                        "FirehoseArn",
+                        "OutputFormat",
+                        "RoleArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeBuild::Project"
+                        "AWS::CloudWatch::MetricStream"
                     ],
                     "type": "string"
                 },
@@ -33658,91 +37059,713 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.Artifacts": {
+        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
             "additionalProperties": false,
             "properties": {
-                "ArtifactIdentifier": {
-                    "type": "string"
-                },
-                "EncryptionDisabled": {
-                    "type": "boolean"
-                },
-                "Location": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "NamespaceType": {
-                    "type": "string"
-                },
-                "OverrideArtifactName": {
-                    "type": "boolean"
-                },
-                "Packaging": {
-                    "type": "string"
-                },
-                "Path": {
-                    "type": "string"
+                "MetricNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Type": {
+                "Namespace": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Namespace"
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.BatchRestrictions": {
+        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ComputeTypesAllowed": {
+                "AdditionalStatistics": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "MaximumBuildsAllowed": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CodeBuild::Project.BuildStatusConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Context": {
-                    "type": "string"
-                },
-                "TargetUrl": {
-                    "type": "string"
+                "IncludeMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "AdditionalStatistics",
+                "IncludeMetrics"
+            ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.CloudWatchLogsConfig": {
+        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric": {
             "additionalProperties": false,
             "properties": {
-                "GroupName": {
-                    "type": "string"
-                },
-                "Status": {
+                "MetricName": {
                     "type": "string"
                 },
-                "StreamName": {
+                "Namespace": {
                     "type": "string"
                 }
             },
             "required": [
-                "Status"
+                "MetricName",
+                "Namespace"
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.Environment": {
+        "AWS::CodeArtifact::Domain": {
             "additionalProperties": false,
             "properties": {
-                "Certificate": {
+                "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": {
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "PermissionsPolicyDocument": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeArtifact::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup": {
+            "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": {
+                        "ContactInfo": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainOwner": {
+                            "type": "string"
+                        },
+                        "OriginConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.OriginConfiguration"
+                        },
+                        "Pattern": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "Pattern"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeArtifact::PackageGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup.OriginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.Restrictions"
+                }
+            },
+            "required": [
+                "Restrictions"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup.RestrictionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Repositories": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RestrictionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RestrictionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup.Restrictions": {
+            "additionalProperties": false,
+            "properties": {
+                "ExternalUpstream": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                },
+                "InternalUpstream": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                },
+                "Publish": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeArtifact::Repository": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainOwner": {
+                            "type": "string"
+                        },
+                        "ExternalConnections": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionsPolicyDocument": {
+                            "type": "object"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Upstreams": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "RepositoryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeArtifact::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Fleet": {
+            "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": {
+                        "BaseCapacity": {
+                            "type": "number"
+                        },
+                        "ComputeType": {
+                            "type": "string"
+                        },
+                        "EnvironmentType": {
+                            "type": "string"
+                        },
+                        "FleetServiceRole": {
+                            "type": "string"
+                        },
+                        "FleetVpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Fleet.VpcConfig"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OverflowBehavior": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project": {
+            "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": {
+                        "Artifacts": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
+                        },
+                        "BadgeEnabled": {
+                            "type": "boolean"
+                        },
+                        "BuildBatchConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectBuildBatchConfig"
+                        },
+                        "Cache": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectCache"
+                        },
+                        "ConcurrentBuildLimit": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.Environment"
+                        },
+                        "FileSystemLocations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectFileSystemLocation"
+                            },
+                            "type": "array"
+                        },
+                        "LogsConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.LogsConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueuedTimeoutInMinutes": {
+                            "type": "number"
+                        },
+                        "ResourceAccessRole": {
+                            "type": "string"
+                        },
+                        "SecondaryArtifacts": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
+                            },
+                            "type": "array"
+                        },
+                        "SecondarySourceVersions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectSourceVersion"
+                            },
+                            "type": "array"
+                        },
+                        "SecondarySources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                        },
+                        "SourceVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        },
+                        "Triggers": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectTriggers"
+                        },
+                        "Visibility": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "Artifacts",
+                        "Environment",
+                        "ServiceRole",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Artifacts": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactIdentifier": {
+                    "type": "string"
+                },
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NamespaceType": {
+                    "type": "string"
+                },
+                "OverrideArtifactName": {
+                    "type": "boolean"
+                },
+                "Packaging": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.BatchRestrictions": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeTypesAllowed": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaximumBuildsAllowed": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.BuildStatusConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Context": {
+                    "type": "string"
+                },
+                "TargetUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.CloudWatchLogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupName": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
                     "type": "string"
                 },
                 "ComputeType": {
@@ -33933,6 +37956,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "ScopeConfiguration": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.ScopeConfiguration"
+                },
                 "Webhook": {
                     "type": "boolean"
                 }
@@ -33973,6 +37999,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Project.ScopeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
         "AWS::CodeBuild::Project.Source": {
             "additionalProperties": false,
             "properties": {
@@ -35818,6 +39856,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.BeforeEntryConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35834,6 +39884,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Result": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleDeclaration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.EncryptionKey": {
             "additionalProperties": false,
             "properties": {
@@ -35850,6 +39915,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.FailureConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                },
+                "Result": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.GitBranchFilterCriteria": {
             "additionalProperties": false,
             "properties": {
@@ -36000,6 +40080,51 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.RuleDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RuleTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleTypeId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.RuleTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.StageDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36009,6 +40134,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "BeforeEntry": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BeforeEntryConditions"
+                },
                 "Blockers": {
                     "items": {
                         "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
@@ -36017,6 +40145,12 @@ var CdkSchema = `{
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.FailureConditions"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.SuccessConditions"
                 }
             },
             "required": [
@@ -36041,6 +40175,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.SuccessConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.VariableDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36731,6 +40877,12 @@ var CdkSchema = `{
                         "IdentityPoolName": {
                             "type": "string"
                         },
+                        "IdentityPoolTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "OpenIdConnectProviderARNs": {
                             "items": {
                                 "type": "string"
@@ -37123,6 +41275,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::LogDeliveryConfiguration.LogConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -37132,8 +41293,23 @@ var CdkSchema = `{
                 "EventSource": {
                     "type": "string"
                 },
+                "FirehoseConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration"
+                },
                 "LogLevel": {
                     "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.S3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::LogDeliveryConfiguration.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -37197,6 +41373,12 @@ var CdkSchema = `{
                         "DeviceConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
                         },
+                        "EmailAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "EmailAuthenticationSubject": {
+                            "type": "string"
+                        },
                         "EmailConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
                         },
@@ -37316,6 +41498,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomAuthMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::UserPool.CustomEmailSender": {
             "additionalProperties": false,
             "properties": {
@@ -37454,6 +41645,9 @@ var CdkSchema = `{
                 "MinimumLength": {
                     "type": "number"
                 },
+                "PasswordHistorySize": {
+                    "type": "number"
+                },
                 "RequireLowercase": {
                     "type": "boolean"
                 },
@@ -37577,6 +41771,9 @@ var CdkSchema = `{
         "AWS::Cognito::UserPool.UserPoolAddOns": {
             "additionalProperties": false,
             "properties": {
+                "AdvancedSecurityAdditionalFlows": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows"
+                },
                 "AdvancedSecurityMode": {
                     "type": "string"
                 }
@@ -40329,6 +44526,97 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::AgentStatus": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayOrder": {
+                            "type": "number"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResetOrderNumber": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "State"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::AgentStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::ApprovedOrigin": {
             "additionalProperties": false,
             "properties": {
@@ -42215,6 +46503,12 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "SubmitAutoEvaluationActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Connect::Rule.SubmitAutoEvaluationAction"
+                    },
+                    "type": "array"
+                },
                 "TaskActions": {
                     "items": {
                         "$ref": "#/definitions/AWS::Connect::Rule.TaskAction"
@@ -42374,6 +46668,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::Rule.SubmitAutoEvaluationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EvaluationFormArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EvaluationFormArn"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::Rule.TaskAction": {
             "additionalProperties": false,
             "properties": {
@@ -43156,7 +47462,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Connect::View": {
+        "AWS::Connect::UserHierarchyStructure": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -43191,42 +47497,21 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Actions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
                         "InstanceArn": {
                             "type": "string"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Template": {
-                            "type": "object"
+                        "UserHierarchyStructure": {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.UserHierarchyStructure"
                         }
                     },
                     "required": [
-                        "Actions",
-                        "InstanceArn",
-                        "Name",
-                        "Template"
+                        "InstanceArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Connect::View"
+                        "AWS::Connect::UserHierarchyStructure"
                     ],
                     "type": "string"
                 },
@@ -43245,7 +47530,207 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Connect::ViewVersion": {
+        "AWS::Connect::UserHierarchyStructure.LevelFive": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFour": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelOne": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelThree": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelTwo": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.UserHierarchyStructure": {
+            "additionalProperties": false,
+            "properties": {
+                "LevelFive": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFive"
+                },
+                "LevelFour": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFour"
+                },
+                "LevelOne": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelOne"
+                },
+                "LevelThree": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelThree"
+                },
+                "LevelTwo": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelTwo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Connect::View": {
+            "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": {
+                        "Actions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Template": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "InstanceArn",
+                        "Name",
+                        "Template"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::View"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ViewVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -47331,9 +51816,6 @@ var CdkSchema = `{
                         "ComputeConfig": {
                             "$ref": "#/definitions/AWS::DMS::ReplicationConfig.ComputeConfig"
                         },
-                        "ReplicationConfigArn": {
-                            "type": "string"
-                        },
                         "ReplicationConfigIdentifier": {
                             "type": "string"
                         },
@@ -47365,6 +51847,14 @@ var CdkSchema = `{
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ComputeConfig",
+                        "ReplicationConfigIdentifier",
+                        "ReplicationType",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -47383,7 +51873,8 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -47482,6 +51973,9 @@ var CdkSchema = `{
                         "MultiAZ": {
                             "type": "boolean"
                         },
+                        "NetworkType": {
+                            "type": "string"
+                        },
                         "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
@@ -51749,9 +56243,18 @@ var CdkSchema = `{
                         "DomainIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentAccountIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentAccountRegion": {
+                            "type": "string"
+                        },
                         "EnvironmentProfileIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentRoleArn": {
+                            "type": "string"
+                        },
                         "GlossaryTerms": {
                             "items": {
                                 "type": "string"
@@ -51773,7 +56276,6 @@ var CdkSchema = `{
                     },
                     "required": [
                         "DomainIdentifier",
-                        "EnvironmentProfileIdentifier",
                         "Name",
                         "ProjectIdentifier"
                     ],
@@ -51812,6 +56314,95 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::DataZone::EnvironmentActions": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::EnvironmentActions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::EnvironmentBlueprintConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -52024,6 +56615,78 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::DataZone::GroupProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "GroupIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::GroupProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::DataZone::Project": {
             "additionalProperties": false,
             "properties": {
@@ -52102,6 +56765,95 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DataZone::ProjectMembership": {
+            "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": {
+                        "Designation": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Member": {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership.Member"
+                        },
+                        "ProjectIdentifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Designation",
+                        "DomainIdentifier",
+                        "Member",
+                        "ProjectIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::ProjectMembership"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::ProjectMembership.Member": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupIdentifier": {
+                    "type": "string"
+                },
+                "UserIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::SubscriptionTarget": {
             "additionalProperties": false,
             "properties": {
@@ -52223,6 +56975,117 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DataZone::UserProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserIdentifier": {
+                            "type": "string"
+                        },
+                        "UserType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "UserIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.IamUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.SsoUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.UserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.IamUserProfileDetails"
+                },
+                "Sso": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.SsoUserProfileDetails"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Deadline::Farm": {
             "additionalProperties": false,
             "properties": {
@@ -52266,6 +57129,12 @@ var CdkSchema = `{
                         },
                         "KmsKeyArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -52349,11 +57218,18 @@ var CdkSchema = `{
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
                         "Configuration",
                         "DisplayName",
+                        "FarmId",
                         "MaxWorkerCount",
                         "RoleArn"
                     ],
@@ -52716,6 +57592,12 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "VpcId": {
                             "type": "string"
                         }
@@ -52783,27 +57665,94 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Family": {
+                        "LicenseEndpointId": {
                             "type": "string"
                         },
-                        "LicenseEndpointId": {
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Deadline::MeteredProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Deadline::Monitor": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "Port": {
-                            "type": "number"
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
                         },
-                        "ProductId": {
+                        "IdentityCenterInstanceArn": {
                             "type": "string"
                         },
-                        "Vendor": {
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Subdomain": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DisplayName",
+                        "IdentityCenterInstanceArn",
+                        "RoleArn",
+                        "Subdomain"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Deadline::MeteredProduct"
+                        "AWS::Deadline::Monitor"
                     ],
                     "type": "string"
                 },
@@ -52817,7 +57766,8 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -52888,10 +57838,17 @@ var CdkSchema = `{
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DisplayName"
+                        "DisplayName",
+                        "FarmId"
                     ],
                     "type": "object"
                 },
@@ -53189,6 +58146,7 @@ var CdkSchema = `{
                     },
                     "required": [
                         "DisplayName",
+                        "FarmId",
                         "OsFamily"
                     ],
                     "type": "object"
@@ -54608,6 +59566,9 @@ var CdkSchema = `{
                         "TimeToLiveSpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
                         },
+                        "WriteOnDemandThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                        },
                         "WriteProvisionedThroughputSettings": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                         }
@@ -54706,6 +59667,9 @@ var CdkSchema = `{
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
                 },
+                "WriteOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                },
                 "WriteProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                 }
@@ -54795,6 +59759,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54816,6 +59789,9 @@ var CdkSchema = `{
                 "IndexName": {
                     "type": "string"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 }
@@ -54858,6 +59834,9 @@ var CdkSchema = `{
                 "PointInTimeRecoverySpecification": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 },
@@ -54975,6 +59954,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -55058,6 +60046,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "OnDemandThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                        },
                         "PointInTimeRecoverySpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
                         },
@@ -55173,6 +60164,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "OnDemandThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                },
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
                 },
@@ -55272,6 +60266,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::Table.OnDemandThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                },
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
             "additionalProperties": false,
             "properties": {
@@ -56229,6 +61235,9 @@ var CdkSchema = `{
                         "BgpAsn": {
                             "type": "number"
                         },
+                        "BgpAsnExtended": {
+                            "type": "number"
+                        },
                         "CertificateArn": {
                             "type": "string"
                         },
@@ -57495,6 +62504,9 @@ var CdkSchema = `{
                         "Description": {
                             "type": "string"
                         },
+                        "EnablePrivateGua": {
+                            "type": "boolean"
+                        },
                         "OperatingRegions": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
@@ -58575,6 +63587,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EC2::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::Instance.Volume": {
             "additionalProperties": false,
             "properties": {
@@ -63251,12 +68275,6 @@ var CdkSchema = `{
                         "Ipv6CidrBlock": {
                             "type": "string"
                         },
-                        "Ipv6CidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Ipv6IpamPoolId": {
                             "type": "string"
                         },
@@ -63670,6 +68688,12 @@ var CdkSchema = `{
                         "SourcePortRange": {
                             "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "TrafficDirection": {
                             "type": "string"
                         },
@@ -63954,6 +68978,9 @@ var CdkSchema = `{
                         "PropagationDefaultRouteTableId": {
                             "type": "string"
                         },
+                        "SecurityGroupReferencingSupport": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -64631,6 +69658,7 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
+                        "DestinationCidrBlock",
                         "TransitGatewayRouteTableId"
                     ],
                     "type": "object"
@@ -64973,6 +70001,9 @@ var CdkSchema = `{
                 },
                 "Ipv6Support": {
                     "type": "string"
+                },
+                "SecurityGroupReferencingSupport": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -65734,6 +70765,24 @@ var CdkSchema = `{
                         "CustomerGatewayId": {
                             "type": "string"
                         },
+                        "EnableAcceleration": {
+                            "type": "boolean"
+                        },
+                        "LocalIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "LocalIpv6NetworkCidr": {
+                            "type": "string"
+                        },
+                        "OutsideIpAddressType": {
+                            "type": "string"
+                        },
+                        "RemoteIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "RemoteIpv6NetworkCidr": {
+                            "type": "string"
+                        },
                         "StaticRoutesOnly": {
                             "type": "boolean"
                         },
@@ -65746,6 +70795,12 @@ var CdkSchema = `{
                         "TransitGatewayId": {
                             "type": "string"
                         },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TunnelInsideIpVersion": {
+                            "type": "string"
+                        },
                         "Type": {
                             "type": "string"
                         },
@@ -67287,6 +72342,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "CustomRoleArn": {
+                            "type": "string"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -67581,6 +72639,9 @@ var CdkSchema = `{
             "properties": {
                 "ExecuteCommandConfiguration": {
                     "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                },
+                "ManagedStorageConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ManagedStorageConfiguration"
                 }
             },
             "type": "object"
@@ -67633,6 +72694,18 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::ECS::Cluster.ManagedStorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FargateEphemeralStorageKmsKeyId": {
+                    "type": "string"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::Cluster.ServiceConnectDefaults": {
             "additionalProperties": false,
             "properties": {
@@ -68649,6 +73722,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "RestartPolicy": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RestartPolicy"
+                },
                 "Secrets": {
                     "items": {
                         "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
@@ -69085,6 +74161,24 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::ECS::TaskDefinition.RestartPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnoredExitCodes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "RestartAttemptPeriod": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::TaskDefinition.RuntimePlatform": {
             "additionalProperties": false,
             "properties": {
@@ -69985,6 +75079,12 @@ var CdkSchema = `{
                         "ConfigurationValues": {
                             "type": "string"
                         },
+                        "PodIdentityAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Addon.PodIdentityAssociation"
+                            },
+                            "type": "array"
+                        },
                         "PreserveOnDelete": {
                             "type": "boolean"
                         },
@@ -70028,6 +75128,22 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EKS::Addon.PodIdentityAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceAccount"
+            ],
+            "type": "object"
+        },
         "AWS::EKS::Cluster": {
             "additionalProperties": false,
             "properties": {
@@ -70066,6 +75182,9 @@ var CdkSchema = `{
                         "AccessConfig": {
                             "$ref": "#/definitions/AWS::EKS::Cluster.AccessConfig"
                         },
+                        "BootstrapSelfManagedAddons": {
+                            "type": "boolean"
+                        },
                         "EncryptionConfig": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
@@ -70096,8 +75215,14 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "UpgradePolicy": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.UpgradePolicy"
+                        },
                         "Version": {
                             "type": "string"
+                        },
+                        "ZonalShiftConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ZonalShiftConfig"
                         }
                     },
                     "required": [
@@ -70272,6 +75397,24 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EKS::Cluster.UpgradePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "SupportType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ZonalShiftConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EKS::FargateProfile": {
             "additionalProperties": false,
             "properties": {
@@ -71224,6 +76367,9 @@ var CdkSchema = `{
                 "Name": {
                     "type": "string"
                 },
+                "ResizeSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetResizingSpecifications"
+                },
                 "TargetOnDemandCapacity": {
                     "type": "number"
                 },
@@ -71245,6 +76391,18 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::EMR::Cluster.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.InstanceGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71309,6 +76467,9 @@ var CdkSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71458,11 +76619,29 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71470,6 +76649,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.PlacementGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71621,6 +76815,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.StepConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71715,6 +76921,9 @@ var CdkSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "ResizeSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications"
+                        },
                         "TargetOnDemandCapacity": {
                             "type": "number"
                         },
@@ -71815,6 +77024,18 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71839,6 +77060,9 @@ var CdkSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71848,11 +77072,29 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71860,6 +77102,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -71882,6 +77139,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -72868,6 +78137,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "InteractiveConfiguration": {
+                            "$ref": "#/definitions/AWS::EMRServerless::Application.InteractiveConfiguration"
+                        },
                         "MaximumCapacity": {
                             "$ref": "#/definitions/AWS::EMRServerless::Application.MaximumAllowedResources"
                         },
@@ -73048,6 +78320,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMRServerless::Application.InteractiveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LivyEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "StudioEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMRServerless::Application.LogTypeMapKeyValuePair": {
             "additionalProperties": false,
             "properties": {
@@ -73152,6 +78436,9 @@ var CdkSchema = `{
                 "Disk": {
                     "type": "string"
                 },
+                "DiskType": {
+                    "type": "string"
+                },
                 "Memory": {
                     "type": "string"
                 }
@@ -75333,6 +80620,12 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "ListenerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute"
+                            },
+                            "type": "array"
+                        },
                         "LoadBalancerArn": {
                             "type": "string"
                         },
@@ -75547,6 +80840,18 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ElasticLoadBalancingV2::Listener.MutualAuthentication": {
             "additionalProperties": false,
             "properties": {
@@ -77010,6 +82315,31 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "RecordMatchingModel": {
+                    "type": "string"
+                },
+                "RuleDefinitionType": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "RecordMatchingModel"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdMappingWorkflow.IdMappingTechniques": {
             "additionalProperties": false,
             "properties": {
@@ -77018,6 +82348,9 @@ var CdkSchema = `{
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.ProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties"
                 }
             },
             "type": "object"
@@ -77091,6 +82424,25 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdNamespace": {
             "additionalProperties": false,
             "properties": {
@@ -77192,6 +82544,9 @@ var CdkSchema = `{
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties"
                 }
             },
             "required": [
@@ -77235,213 +82590,34 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow": {
+        "AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "AttributeMatchingModel": {
                     "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
-                            },
-                            "type": "array"
-                        },
-                        "OutputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
-                            },
-                            "type": "array"
-                        },
-                        "ResolutionTechniques": {
-                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "WorkflowName": {
-                            "type": "string"
-                        }
+                "RecordMatchingModels": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "InputSourceConfig",
-                        "OutputSourceConfig",
-                        "ResolutionTechniques",
-                        "RoleArn",
-                        "WorkflowName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::EntityResolution::MatchingWorkflow"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "InputSourceARN": {
-                    "type": "string"
-                },
-                "SchemaArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputSourceARN",
-                "SchemaArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "IntermediateS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
-            "additionalProperties": false,
-            "properties": {
-                "Hashed": {
-                    "type": "boolean"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "KMSArn": {
-                    "type": "string"
+                    "type": "array"
                 },
-                "Output": {
+                "RuleDefinitionTypes": {
                     "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "OutputS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Output",
-                "OutputS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateSourceConfiguration": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
-                },
-                "ProviderConfiguration": {
-                    "additionalProperties": true,
-                    "patternProperties": {
-                        "^[a-zA-Z0-9]+$": {
-                            "type": "string"
-                        }
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.Rule"
                     },
-                    "type": "object"
-                },
-                "ProviderServiceArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ProviderServiceArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
-            "additionalProperties": false,
-            "properties": {
-                "ProviderProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
-                },
-                "ResolutionType": {
-                    "type": "string"
-                },
-                "RuleBasedProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                    "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+        "AWS::EntityResolution::IdNamespace.Rule": {
             "additionalProperties": false,
             "properties": {
                 "MatchingKeys": {
@@ -77460,26 +82636,269 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "AttributeMatchingModel": {
-                    "type": "string"
-                },
-                "Rules": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AttributeMatchingModel",
-                "Rules"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::PolicyStatement": {
+        "AWS::EntityResolution::MatchingWorkflow": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IncrementalRunConfig": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig"
+                        },
+                        "InputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
+                            },
+                            "type": "array"
+                        },
+                        "OutputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
+                            },
+                            "type": "array"
+                        },
+                        "ResolutionTechniques": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputSourceConfig",
+                        "OutputSourceConfig",
+                        "ResolutionTechniques",
+                        "RoleArn",
+                        "WorkflowName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EntityResolution::MatchingWorkflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IncrementalRunType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IncrementalRunType"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "InputSourceARN": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSourceARN",
+                "SchemaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Hashed": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "KMSArn": {
+                    "type": "string"
+                },
+                "Output": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                    },
+                    "type": "array"
+                },
+                "OutputS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Output",
+                "OutputS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateSourceConfiguration": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
+                },
+                "ProviderConfiguration": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ProviderServiceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderServiceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
+                },
+                "ResolutionType": {
+                    "type": "string"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "MatchPurpose": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::PolicyStatement": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -77656,6 +83075,9 @@ var CdkSchema = `{
                 "GroupName": {
                     "type": "string"
                 },
+                "Hashed": {
+                    "type": "boolean"
+                },
                 "MatchKey": {
                     "type": "string"
                 },
@@ -78580,9 +84002,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Events::EventBus.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
                         "EventSourceName": {
                             "type": "string"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -78622,6 +84053,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Events::EventBus.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Events::EventBusPolicy": {
             "additionalProperties": false,
             "properties": {
@@ -80597,80 +86037,95 @@ var CdkSchema = `{
             },
             "type": "object"
         },
-        "AWS::FMS::Policy.NetworkFirewallPolicy": {
+        "AWS::FMS::Policy.IcmpTypeCode": {
             "additionalProperties": false,
             "properties": {
-                "FirewallDeploymentModel": {
-                    "type": "string"
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
                 }
             },
             "required": [
-                "FirewallDeploymentModel"
+                "Code",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyOption": {
+        "AWS::FMS::Policy.NetworkAclCommonPolicy": {
             "additionalProperties": false,
             "properties": {
-                "NetworkFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
-                },
-                "ThirdPartyFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                "NetworkAclEntrySet": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntrySet"
                 }
             },
+            "required": [
+                "NetworkAclEntrySet"
+            ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyTag": {
+        "AWS::FMS::Policy.NetworkAclEntry": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CidrBlock": {
                     "type": "string"
                 },
-                "Value": {
+                "Egress": {
+                    "type": "boolean"
+                },
+                "IcmpTypeCode": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.IcmpTypeCode"
+                },
+                "Ipv6CidrBlock": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::FMS::Policy.ResourceTag": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PortRange"
+                },
+                "Protocol": {
                     "type": "string"
                 },
-                "Value": {
+                "RuleAction": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key"
+                "Egress",
+                "Protocol",
+                "RuleAction"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.SecurityServicePolicyData": {
+        "AWS::FMS::Policy.NetworkAclEntrySet": {
             "additionalProperties": false,
             "properties": {
-                "ManagedServiceData": {
-                    "type": "string"
+                "FirstEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 },
-                "PolicyOption": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                "ForceRemediateForFirstEntries": {
+                    "type": "boolean"
                 },
-                "Type": {
-                    "type": "string"
+                "ForceRemediateForLastEntries": {
+                    "type": "boolean"
+                },
+                "LastEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Type"
+                "ForceRemediateForFirstEntries",
+                "ForceRemediateForLastEntries"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
+        "AWS::FMS::Policy.NetworkFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
                 "FirewallDeploymentModel": {
@@ -80682,224 +86137,316 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::FMS::ResourceSet": {
+        "AWS::FMS::Policy.PolicyOption": {
             "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"
-                        }
-                    ]
+                "NetworkAclCommonPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclCommonPolicy"
                 },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ResourceTypeList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Resources": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "ResourceTypeList"
-                    ],
-                    "type": "object"
+                "NetworkFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::FMS::ResourceSet"
-                    ],
+                "ThirdPartyFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation": {
+        "AWS::FMS::Policy.PortRange": {
             "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": {
-                        "BatchImportMetaDataOnCreate": {
-                            "type": "boolean"
-                        },
-                        "DataRepositoryPath": {
-                            "type": "string"
-                        },
-                        "FileSystemId": {
-                            "type": "string"
-                        },
-                        "FileSystemPath": {
-                            "type": "string"
-                        },
-                        "ImportedFileChunkSize": {
-                            "type": "number"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DataRepositoryPath",
-                        "FileSystemId",
-                        "FileSystemPath"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::FSx::DataRepositoryAssociation"
-                    ],
-                    "type": "string"
+                "From": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "To": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "From",
+                "To"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+        "AWS::FMS::Policy.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+        "AWS::FMS::Policy.SecurityServicePolicyData": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ManagedServiceData": {
+                    "type": "string"
+                },
+                "PolicyOption": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.S3": {
+        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
-                "AutoExportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
-                },
-                "AutoImportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                "FirewallDeploymentModel": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "FirewallDeploymentModel"
+            ],
             "type": "object"
         },
-        "AWS::FSx::FileSystem": {
+        "AWS::FMS::ResourceSet": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ResourceTypeList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation": {
+            "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": {
+                        "BatchImportMetaDataOnCreate": {
+                            "type": "boolean"
+                        },
+                        "DataRepositoryPath": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "FileSystemPath": {
+                            "type": "string"
+                        },
+                        "ImportedFileChunkSize": {
+                            "type": "number"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataRepositoryPath",
+                        "FileSystemId",
+                        "FileSystemPath"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::DataRepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoExportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
+                },
+                "AutoImportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -81089,6 +86636,9 @@ var CdkSchema = `{
                 "ImportedFileChunkSize": {
                     "type": "number"
                 },
+                "MetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.MetadataConfiguration"
+                },
                 "PerUnitStorageThroughput": {
                     "type": "number"
                 },
@@ -81098,6 +86648,18 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::FSx::FileSystem.MetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::FSx::FileSystem.NfsExports": {
             "additionalProperties": false,
             "properties": {
@@ -84876,6 +90438,9 @@ var CdkSchema = `{
         "AWS::GlobalAccelerator::CrossAccountAttachment.Resource": {
             "additionalProperties": false,
             "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
                 "EndpointId": {
                     "type": "string"
                 },
@@ -84883,9 +90448,6 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "EndpointId"
-            ],
             "type": "object"
         },
         "AWS::GlobalAccelerator::EndpointGroup": {
@@ -85593,6 +91155,12 @@ var CdkSchema = `{
                 "ConnectionName": {
                     "type": "string"
                 },
+                "EnableAdditionalMetadata": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "Exclusions": {
                     "items": {
                         "type": "string"
@@ -86043,6 +91611,9 @@ var CdkSchema = `{
                         },
                         "DatabaseInput": {
                             "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -86325,9 +91896,18 @@ var CdkSchema = `{
                         "GlueVersion": {
                             "type": "string"
                         },
+                        "JobMode": {
+                            "type": "string"
+                        },
+                        "JobRunQueuingEnabled": {
+                            "type": "boolean"
+                        },
                         "LogUri": {
                             "type": "string"
                         },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
                         "MaxCapacity": {
                             "type": "number"
                         },
@@ -87953,7 +93533,7 @@ var CdkSchema = `{
             },
             "type": "object"
         },
-        "AWS::Glue::Workflow": {
+        "AWS::Glue::UsageProfile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -87988,27 +93568,30 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultRunProperties": {
-                            "type": "object"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ProfileConfiguration"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "MaxConcurrentRuns": {
-                            "type": "number"
-                        },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "type": "object"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Glue::Workflow"
+                        "AWS::Glue::UsageProfile"
                     ],
                     "type": "string"
                 },
@@ -88022,11 +93605,130 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Grafana::Workspace": {
+        "AWS::Glue::UsageProfile.ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::UsageProfile.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JobConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SessionConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "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": {
+                        "DefaultRunProperties": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentRuns": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Grafana::Workspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91797,7 +97499,9 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "FindingCriteria"
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name"
                     ],
                     "type": "object"
                 },
@@ -92007,7 +97711,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Master": {
+        "AWS::GuardDuty::MalwareProtectionPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92042,25 +97746,31 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DetectorId": {
-                            "type": "string"
+                        "Actions": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNActions"
                         },
-                        "InvitationId": {
-                            "type": "string"
+                        "ProtectedResource": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource"
                         },
-                        "MasterId": {
+                        "Role": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.TagItem"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DetectorId",
-                        "MasterId"
+                        "ProtectedResource",
+                        "Role"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Master"
+                        "AWS::GuardDuty::MalwareProtectionPlan"
                     ],
                     "type": "string"
                 },
@@ -92079,7 +97789,80 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Member": {
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNActions": {
+            "additionalProperties": false,
+            "properties": {
+                "Tagging": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNTagging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.S3Bucket"
+                }
+            },
+            "required": [
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNTagging": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.S3Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "ObjectPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92117,30 +97900,22 @@ var CdkSchema = `{
                         "DetectorId": {
                             "type": "string"
                         },
-                        "DisableEmailNotification": {
-                            "type": "boolean"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "MemberId": {
-                            "type": "string"
-                        },
-                        "Message": {
+                        "InvitationId": {
                             "type": "string"
                         },
-                        "Status": {
+                        "MasterId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Email"
+                        "DetectorId",
+                        "MasterId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Member"
+                        "AWS::GuardDuty::Master"
                     ],
                     "type": "string"
                 },
@@ -92159,7 +97934,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet": {
+        "AWS::GuardDuty::Member": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92194,37 +97969,33 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Activate": {
-                            "type": "boolean"
-                        },
                         "DetectorId": {
                             "type": "string"
                         },
-                        "Format": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
                             "type": "string"
                         },
-                        "Location": {
+                        "MemberId": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Message": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
-                            },
-                            "type": "array"
+                        "Status": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "Location"
+                        "Email"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::ThreatIntelSet"
+                        "AWS::GuardDuty::Member"
                     ],
                     "type": "string"
                 },
@@ -92243,23 +98014,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::HealthImaging::Datastore": {
+        "AWS::GuardDuty::ThreatIntelSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92294,27 +98049,37 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DatastoreName": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
                             },
-                            "type": "object"
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Format",
+                        "Location"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::HealthImaging::Datastore"
+                        "AWS::GuardDuty::ThreatIntelSet"
                     ],
                     "type": "string"
                 },
@@ -92328,11 +98093,101 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::HealthLake::FHIRDatastore": {
+        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthImaging::Datastore": {
+            "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": {
+                        "DatastoreName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthImaging::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92949,9 +98804,6 @@ var CdkSchema = `{
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "ThumbprintList"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -92970,8 +98822,7 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -94147,7 +99998,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration": {
+        "AWS::IVS::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94182,36 +100033,24 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DestinationConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
-                        },
                         "Name": {
                             "type": "string"
                         },
-                        "RecordingReconnectWindowSeconds": {
-                            "type": "number"
-                        },
-                        "RenditionConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        "PublicKeyMaterial": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ThumbnailConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
-                    "required": [
-                        "DestinationConfiguration"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::RecordingConfiguration"
+                        "AWS::IVS::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -94225,69 +100064,11 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RenditionSelection": {
-                    "type": "string"
-                },
-                "Renditions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "BucketName": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "BucketName"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RecordingMode": {
-                    "type": "string"
-                },
-                "Resolution": {
-                    "type": "string"
-                },
-                "Storage": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TargetIntervalSeconds": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::Stage": {
+        "AWS::IVS::RecordingConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94322,21 +100103,36 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "RecordingReconnectWindowSeconds": {
+                            "type": "number"
+                        },
+                        "RenditionConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "ThumbnailConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::Stage"
+                        "AWS::IVS::RecordingConfiguration"
                     ],
                     "type": "string"
                 },
@@ -94350,85 +100146,36 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RenditionSelection": {
                     "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": {
-                        "Name": {
-                            "type": "string"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "Renditions": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "S3"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::IVS::StorageConfiguration"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "BucketName": {
@@ -94440,7 +100187,202 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::IVS::StreamKey": {
+        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordingMode": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                },
+                "Storage": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetIntervalSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::Stage": {
+            "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": {
+                        "AutoParticipantRecordingConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::Stage.AutoParticipantRecordingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Stage.AutoParticipantRecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MediaTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StorageConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StorageConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -96875,6 +102817,12 @@ var CdkSchema = `{
                             "$ref": "#/definitions/AWS::InspectorV2::CisScanConfiguration.CisTargets"
                         }
                     },
+                    "required": [
+                        "ScanName",
+                        "Schedule",
+                        "SecurityLevel",
+                        "Targets"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -96893,7 +102841,8 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -98556,9 +104505,18 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ApplicationProtocol": {
+                            "type": "string"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
                         "AuthorizerConfig": {
                             "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
                         },
+                        "ClientCertificateConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.ClientCertificateConfig"
+                        },
                         "DomainConfigurationName": {
                             "type": "string"
                         },
@@ -98627,6 +104585,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::IoT::DomainConfiguration.ClientCertificateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientCertificateCallbackArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::IoT::DomainConfiguration.ServerCertificateConfig": {
             "additionalProperties": false,
             "properties": {
@@ -104082,6 +110049,12 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "SignalsToFetch": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchInformation"
+                            },
+                            "type": "array"
+                        },
                         "SpoolingMode": {
                             "type": "string"
                         },
@@ -104099,7 +110072,6 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "Action",
                         "CollectionScheme",
                         "Name",
                         "SignalCatalogArn",
@@ -104161,9 +110133,28 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                },
+                "TriggerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression",
+                "TriggerMode"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.DataDestinationConfig": {
             "additionalProperties": false,
             "properties": {
+                "MqttTopicConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.MqttTopicConfig"
+                },
                 "S3Config": {
                     "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.S3Config"
                 },
@@ -104173,6 +110164,22 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.MqttTopicConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "MqttTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "MqttTopicArn"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.S3Config": {
             "additionalProperties": false,
             "properties": {
@@ -104194,6 +110201,44 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.SignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig"
+                },
+                "TimeBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTFleetWise::Campaign.SignalFetchInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConditionLanguageVersion": {
+                    "type": "number"
+                },
+                "FullyQualifiedName": {
+                    "type": "string"
+                },
+                "SignalFetchConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchConfig"
+                }
+            },
+            "required": [
+                "Actions",
+                "FullyQualifiedName",
+                "SignalFetchConfig"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.SignalInformation": {
             "additionalProperties": false,
             "properties": {
@@ -104224,6 +110269,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionFrequencyMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutionFrequencyMs"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.TimestreamConfig": {
             "additionalProperties": false,
             "properties": {
@@ -111101,6 +117158,75 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Kinesis::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "ResourcePolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kinesis::Stream": {
             "additionalProperties": false,
             "properties": {
@@ -112015,6 +118141,9 @@ var CdkSchema = `{
                 "ApplicationSnapshotConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
                 },
+                "ApplicationSystemRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration"
+                },
                 "EnvironmentProperties": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
                 },
@@ -112075,6 +118204,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RollbackEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "RollbackEnabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
             "additionalProperties": false,
             "properties": {
@@ -113037,6 +119178,9 @@ var CdkSchema = `{
                         "HttpEndpointDestinationConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
                         },
+                        "IcebergDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration"
+                        },
                         "KinesisStreamSourceConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
                         },
@@ -113248,6 +119392,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113326,6 +119479,31 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDatabaseName": {
+                    "type": "string"
+                },
+                "DestinationTableName": {
+                    "type": "string"
+                },
+                "S3ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "UniqueKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DestinationDatabaseName",
+                "DestinationTableName"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.DocumentIdOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113566,6 +119744,9 @@ var CdkSchema = `{
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
@@ -113589,6 +119770,47 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "DestinationTableConfigurationList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration"
+                    },
+                    "type": "array"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "s3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CatalogConfiguration",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -113635,6 +119857,9 @@ var CdkSchema = `{
                 "MSKClusterARN": {
                     "type": "string"
                 },
+                "ReadFromTimestamp": {
+                    "type": "string"
+                },
                 "TopicName": {
                     "type": "string"
                 }
@@ -113821,6 +120046,9 @@ var CdkSchema = `{
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "Username": {
                     "type": "string"
                 }
@@ -113828,10 +120056,8 @@ var CdkSchema = `{
             "required": [
                 "ClusterJDBCURL",
                 "CopyCommand",
-                "Password",
                 "RoleARN",
-                "S3Configuration",
-                "Username"
+                "S3Configuration"
             ],
             "type": "object"
         },
@@ -113911,6 +120137,24 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecretARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.Serializer": {
             "additionalProperties": false,
             "properties": {
@@ -113923,12 +120167,27 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.SnowflakeDestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "AccountUrl": {
                     "type": "string"
                 },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints"
+                },
                 "CloudWatchLoggingOptions": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
                 },
@@ -113968,6 +120227,9 @@ var CdkSchema = `{
                 "Schema": {
                     "type": "string"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "SnowflakeRoleConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeRoleConfiguration"
                 },
@@ -113984,12 +120246,10 @@ var CdkSchema = `{
             "required": [
                 "AccountUrl",
                 "Database",
-                "PrivateKey",
                 "RoleARN",
                 "S3Configuration",
                 "Schema",
-                "Table",
-                "User"
+                "Table"
             ],
             "type": "object"
         },
@@ -114070,12 +120330,14 @@ var CdkSchema = `{
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
                 "HECEndpoint",
                 "HECEndpointType",
-                "HECToken",
                 "S3Configuration"
             ],
             "type": "object"
@@ -115444,9 +121706,6 @@ var CdkSchema = `{
                     "type": "array"
                 }
             },
-            "required": [
-                "AdditionalVersionWeights"
-            ],
             "type": "object"
         },
         "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
@@ -115520,6 +121779,12 @@ var CdkSchema = `{
                         },
                         "Description": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -115757,6 +122022,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
                         "MaximumBatchingWindowInSeconds": {
                             "type": "number"
                         },
@@ -115796,6 +122064,12 @@ var CdkSchema = `{
                         "StartingPositionTimestamp": {
                             "type": "number"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "Topics": {
                             "items": {
                                 "type": "string"
@@ -116038,6 +122312,9 @@ var CdkSchema = `{
                         "PackageType": {
                             "type": "string"
                         },
+                        "RecursiveLoop": {
+                            "type": "string"
+                        },
                         "ReservedConcurrentExecutions": {
                             "type": "number"
                         },
@@ -116111,6 +122388,9 @@ var CdkSchema = `{
                 "S3ObjectVersion": {
                     "type": "string"
                 },
+                "SourceKMSKeyArn": {
+                    "type": "string"
+                },
                 "ZipFile": {
                     "type": "string"
                 }
@@ -116704,6 +122984,9 @@ var CdkSchema = `{
                         "FunctionName": {
                             "type": "string"
                         },
+                        "Policy": {
+                            "type": "object"
+                        },
                         "ProvisionedConcurrencyConfig": {
                             "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
                         },
@@ -116764,6 +123047,110 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::LaunchWizard::Deployment": {
+            "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": {
+                        "DeploymentPatternName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Specifications": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LaunchWizard::Deployment.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "WorkloadName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeploymentPatternName",
+                        "Name",
+                        "Specifications",
+                        "WorkloadName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LaunchWizard::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LaunchWizard::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
         "AWS::Lex::Bot": {
             "additionalProperties": false,
             "properties": {
@@ -124269,6 +130656,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::MSK::Replicator.ReplicationTopicNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MSK::Replicator.TopicReplication": {
             "additionalProperties": false,
             "properties": {
@@ -124284,6 +130680,9 @@ var CdkSchema = `{
                 "StartingPosition": {
                     "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationStartingPosition"
                 },
+                "TopicNameConfiguration": {
+                    "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationTopicNameConfiguration"
+                },
                 "TopicsToExclude": {
                     "items": {
                         "type": "string"
@@ -124599,9 +130998,15 @@ var CdkSchema = `{
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
                         },
+                        "MaxWebservers": {
+                            "type": "number"
+                        },
                         "MaxWorkers": {
                             "type": "number"
                         },
+                        "MinWebservers": {
+                            "type": "number"
+                        },
                         "MinWorkers": {
                             "type": "number"
                         },
@@ -125988,6 +132393,15 @@ var CdkSchema = `{
                         "AvailabilityZone": {
                             "type": "string"
                         },
+                        "Maintenance": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Maintenance"
+                        },
+                        "MediaStreams": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStream"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -125996,6 +132410,15 @@ var CdkSchema = `{
                         },
                         "SourceFailoverConfig": {
                             "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        },
+                        "SourceMonitoringConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.SourceMonitoringConfig"
+                        },
+                        "VpcInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.VpcInterface"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -126079,6 +132502,33 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.Fmtp": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelOrder": {
+                    "type": "string"
+                },
+                "Colorimetry": {
+                    "type": "string"
+                },
+                "ExactFramerate": {
+                    "type": "string"
+                },
+                "Par": {
+                    "type": "string"
+                },
+                "Range": {
+                    "type": "string"
+                },
+                "ScanMode": {
+                    "type": "string"
+                },
+                "Tcs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.GatewayBridgeSource": {
             "additionalProperties": false,
             "properties": {
@@ -126094,6 +132544,119 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.InputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Interface"
+                }
+            },
+            "required": [
+                "InputPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Maintenance": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceDay": {
+                    "type": "string"
+                },
+                "MaintenanceStartHour": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaintenanceDay",
+                "MaintenanceStartHour"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamAttributes"
+                },
+                "ClockRate": {
+                    "type": "number"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Fmt": {
+                    "type": "number"
+                },
+                "MediaStreamId": {
+                    "type": "number"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                },
+                "MediaStreamType": {
+                    "type": "string"
+                },
+                "VideoFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MediaStreamId",
+                "MediaStreamName",
+                "MediaStreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Fmtp": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Fmtp"
+                },
+                "Lang": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingName": {
+                    "type": "string"
+                },
+                "InputConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.InputConfiguration"
+                    },
+                    "type": "array"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.Source": {
             "additionalProperties": false,
             "properties": {
@@ -126121,6 +132684,15 @@ var CdkSchema = `{
                 "MaxLatency": {
                     "type": "number"
                 },
+                "MaxSyncBuffer": {
+                    "type": "number"
+                },
+                "MediaStreamSourceConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamSourceConfiguration"
+                    },
+                    "type": "array"
+                },
                 "MinLatency": {
                     "type": "number"
                 },
@@ -126160,154 +132732,202 @@ var CdkSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.SourcePriority": {
+        "AWS::MediaConnect::Flow.SourceMonitoringConfig": {
             "additionalProperties": false,
             "properties": {
-                "PrimarySource": {
+                "ThumbnailState": {
                     "type": "string"
                 }
             },
             "required": [
-                "PrimarySource"
+                "ThumbnailState"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
+        "AWS::MediaConnect::Flow.SourcePriority": {
             "additionalProperties": false,
             "properties": {
-                "VpcInterfaceName": {
+                "PrimarySource": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PrimarySource"
+            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement": {
+        "AWS::MediaConnect::Flow.VpcInterface": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Name": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "NetworkInterfaceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "NetworkInterfaceType": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "RoleArn": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DataTransferSubscriberFeePercent": {
-                            "type": "number"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Encryption": {
-                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
-                        },
-                        "EntitlementStatus": {
-                            "type": "string"
-                        },
-                        "FlowArn": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Description",
-                        "FlowArn",
-                        "Name",
-                        "Subscribers"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::MediaConnect::FlowEntitlement"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "SubnetId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "RoleArn",
+                "SecurityGroupIds",
+                "SubnetId"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
-                "Algorithm": {
-                    "type": "string"
-                },
-                "ConstantInitializationVector": {
-                    "type": "string"
-                },
-                "DeviceId": {
-                    "type": "string"
-                },
-                "KeyType": {
-                    "type": "string"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "ResourceId": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                },
-                "SecretArn": {
-                    "type": "string"
-                },
-                "Url": {
+                "VpcInterfaceName": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Algorithm",
-                "RoleArn"
-            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowOutput": {
+        "AWS::MediaConnect::FlowEntitlement": {
+            "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": {
+                        "DataTransferSubscriberFeePercent": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
+                        },
+                        "EntitlementStatus": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "FlowArn",
+                        "Name",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowEntitlement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "DeviceId": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Algorithm",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -126363,12 +132983,21 @@ var CdkSchema = `{
                         "MaxLatency": {
                             "type": "number"
                         },
+                        "MediaStreamOutputConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "MinLatency": {
                             "type": "number"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "OutputStatus": {
+                            "type": "string"
+                        },
                         "Port": {
                             "type": "number"
                         },
@@ -126415,6 +133044,41 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationIp": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Interface"
+                }
+            },
+            "required": [
+                "DestinationIp",
+                "DestinationPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.EncodingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFactor": {
+                    "type": "number"
+                },
+                "EncoderProfile": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionFactor"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -126437,6 +133101,43 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.DestinationConfiguration"
+                    },
+                    "type": "array"
+                },
+                "EncodingName": {
+                    "type": "string"
+                },
+                "EncodingParameters": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.EncodingParameters"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
@@ -127594,6 +134295,9 @@ var CdkSchema = `{
             "properties": {
                 "AvailSettings": {
                     "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                },
+                "Scte35SegmentationScope": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -128520,6 +135224,9 @@ var CdkSchema = `{
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "NumRefFrames": {
                     "type": "number"
                 },
@@ -128667,6 +135374,9 @@ var CdkSchema = `{
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "MvOverPictureBoundaries": {
                     "type": "string"
                 },
@@ -130376,7 +137086,7 @@ var CdkSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaLive::Input": {
+        "AWS::MediaLive::ChannelPlacementGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130411,57 +137121,30 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
-                            },
-                            "type": "array"
+                        "ClusterId": {
+                            "type": "string"
                         },
-                        "InputDevices": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
-                            },
-                            "type": "array"
+                        "Name": {
+                            "type": "string"
                         },
-                        "InputSecurityGroups": {
+                        "Nodes": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "MediaConnectFlows": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Sources": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                                "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup.Tags"
                             },
                             "type": "array"
-                        },
-                        "Tags": {
-                            "type": "object"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "Vpc": {
-                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
                         }
                     },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Input"
+                        "AWS::MediaLive::ChannelPlacementGroup"
                     ],
                     "type": "string"
                 },
@@ -130479,76 +137162,727 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Input.InputDestinationRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "StreamName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputSourceRequest": {
+        "AWS::MediaLive::ChannelPlacementGroup.Tags": {
             "additionalProperties": false,
             "properties": {
-                "PasswordParam": {
-                    "type": "string"
-                },
-                "Url": {
+                "Key": {
                     "type": "string"
                 },
-                "Username": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputVpcRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "SecurityGroupIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "SubnetIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "FlowArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::InputSecurityGroup": {
+        "AWS::MediaLive::CloudWatchAlarmTemplate": {
+            "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": {
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetResourceType": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods",
+                        "GroupIdentifier",
+                        "MetricName",
+                        "Name",
+                        "Period",
+                        "Statistic",
+                        "TargetResourceType",
+                        "Threshold",
+                        "TreatMissingData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::CloudWatchAlarmTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster": {
+            "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": {
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster.ClusterNetworkSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Cluster.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.ClusterNetworkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRoute": {
+                    "type": "string"
+                },
+                "InterfaceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Cluster.InterfaceMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.InterfaceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalInterfaceName": {
+                    "type": "string"
+                },
+                "NetworkId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventTargets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget"
+                            },
+                            "type": "array"
+                        },
+                        "EventType": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "EventType",
+                        "GroupIdentifier",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "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": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "InputDevices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
+                            },
+                            "type": "array"
+                        },
+                        "InputSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MediaConnectFlows": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                            },
+                            "type": "array"
+                        },
+                        "SrtSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.SrtSettingsRequest"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDestinationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputVpcRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerDecryptionRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "PassphraseSecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerDecryptionRequest"
+                },
+                "MinimumLatency": {
+                    "type": "number"
+                },
+                "SrtListenerAddress": {
+                    "type": "string"
+                },
+                "SrtListenerPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtSettingsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SrtCallerSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerSourceRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130659,41 +137993,500 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
-                            },
-                            "type": "array"
-                        },
-                        "MultiplexSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "MultiplexSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZones",
+                        "MultiplexSettings",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntitlementArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexMediaConnectOutputDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumVideoBufferDelayMilliseconds": {
+                    "type": "number"
+                },
+                "TransportStreamBitrate": {
+                    "type": "number"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "TransportStreamReservedBitrate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TransportStreamBitrate",
+                "TransportStreamId"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram": {
+            "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": {
+                        "MultiplexId": {
+                            "type": "string"
+                        },
+                        "MultiplexProgramSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
+                        },
+                        "PacketIdentifiersMap": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        },
+                        "PipelineDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredChannelPipeline": {
+                            "type": "string"
+                        },
+                        "ProgramName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplexprogram"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbSubPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbTeletextPid": {
+                    "type": "number"
+                },
+                "EtvPlatformPid": {
+                    "type": "number"
+                },
+                "EtvSignalPid": {
+                    "type": "number"
+                },
+                "KlvDataPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "PcrPid": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "number"
+                },
+                "PrivateMetadataPid": {
+                    "type": "number"
+                },
+                "Scte27Pids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Scte35Pid": {
+                    "type": "number"
+                },
+                "TimedMetadataPid": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveChannelPipeline": {
+                    "type": "string"
+                },
+                "PipelineId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PreferredChannelPipeline": {
+                    "type": "string"
+                },
+                "ProgramNumber": {
+                    "type": "number"
+                },
+                "ServiceDescriptor": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
+                },
+                "VideoSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                }
+            },
+            "required": [
+                "ProgramNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumBitrate": {
+                    "type": "number"
+                },
+                "MinimumBitrate": {
+                    "type": "number"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantBitrate": {
+                    "type": "number"
+                },
+                "StatmuxSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network": {
+            "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": {
+                        "IpPools": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.IpPool"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Routes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Route"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpPools",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Network"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.IpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Route": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Gateway": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::SdiSource": {
+            "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": {
+                        "Mode": {
+                            "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                                "$ref": "#/definitions/AWS::MediaLive::SdiSource.Tags"
                             },
                             "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AvailabilityZones",
-                        "MultiplexSettings",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplex"
+                        "AWS::MediaLive::SdiSource"
                     ],
                     "type": "string"
                 },
@@ -130712,47 +138505,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "EntitlementArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
-            "additionalProperties": false,
-            "properties": {
-                "MultiplexMediaConnectOutputDestinationSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumVideoBufferDelayMilliseconds": {
-                    "type": "number"
-                },
-                "TransportStreamBitrate": {
-                    "type": "number"
-                },
-                "TransportStreamId": {
-                    "type": "number"
-                },
-                "TransportStreamReservedBitrate": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "TransportStreamBitrate",
-                "TransportStreamId"
-            ],
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.Tags": {
+        "AWS::MediaLive::SdiSource.Tags": {
             "additionalProperties": false,
             "properties": {
                 "Key": {
@@ -130764,7 +138517,7 @@ var CdkSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram": {
+        "AWS::MediaLive::SignalMap": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130799,36 +138552,49 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ChannelId": {
-                            "type": "string"
+                        "CloudWatchAlarmTemplateGroupIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "MultiplexId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MultiplexProgramSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
-                        },
-                        "PacketIdentifiersMap": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        "DiscoveryEntryPointArn": {
+                            "type": "string"
                         },
-                        "PipelineDetails": {
+                        "EventBridgeRuleTemplateGroupIdentifiers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "PreferredChannelPipeline": {
-                            "type": "string"
+                        "ForceRediscovery": {
+                            "type": "boolean"
                         },
-                        "ProgramName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
+                    "required": [
+                        "DiscoveryEntryPointArn",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplexprogram"
+                        "AWS::MediaLive::SignalMap"
                     ],
                     "type": "string"
                 },
@@ -130842,143 +138608,81 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+        "AWS::MediaLive::SignalMap.MediaResource": {
             "additionalProperties": false,
             "properties": {
-                "AudioPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbSubPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbTeletextPid": {
-                    "type": "number"
-                },
-                "EtvPlatformPid": {
-                    "type": "number"
-                },
-                "EtvSignalPid": {
-                    "type": "number"
-                },
-                "KlvDataPids": {
+                "Destinations": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
                 },
-                "PcrPid": {
-                    "type": "number"
-                },
-                "PmtPid": {
-                    "type": "number"
-                },
-                "PrivateMetadataPid": {
-                    "type": "number"
+                "Name": {
+                    "type": "string"
                 },
-                "Scte27Pids": {
+                "Sources": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
-                },
-                "Scte35Pid": {
-                    "type": "number"
-                },
-                "TimedMetadataPid": {
-                    "type": "number"
-                },
-                "VideoPid": {
-                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+        "AWS::MediaLive::SignalMap.MediaResourceNeighbor": {
             "additionalProperties": false,
             "properties": {
-                "ActiveChannelPipeline": {
+                "Arn": {
                     "type": "string"
                 },
-                "PipelineId": {
+                "Name": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Arn"
+            ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+        "AWS::MediaLive::SignalMap.MonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "ProviderName": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ServiceName": {
+                "ErrorMessage": {
+                    "type": "string"
+                },
+                "Status": {
                     "type": "string"
                 }
             },
             "required": [
-                "ProviderName",
-                "ServiceName"
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+        "AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "PreferredChannelPipeline": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ProgramNumber": {
-                    "type": "number"
-                },
-                "ServiceDescriptor": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
-                },
-                "VideoSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                "Status": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ProgramNumber"
+                "DetailsUri",
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumBitrate": {
-                    "type": "number"
-                },
-                "MinimumBitrate": {
-                    "type": "number"
-                },
-                "Priority": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "ConstantBitrate": {
-                    "type": "number"
-                },
-                "StatmuxSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
-                }
-            },
-            "type": "object"
-        },
         "AWS::MediaPackage::Asset": {
             "additionalProperties": false,
             "properties": {
@@ -132168,6 +139872,9 @@ var CdkSchema = `{
                         "Description": {
                             "type": "string"
                         },
+                        "InputType": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -132405,9 +140112,18 @@ var CdkSchema = `{
                         "ContainerType": {
                             "type": "string"
                         },
+                        "DashManifests": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Description": {
                             "type": "string"
                         },
+                        "ForceEndpointErrorConfiguration": {
+                            "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration"
+                        },
                         "HlsManifests": {
                             "items": {
                                 "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration"
@@ -132439,6 +140155,7 @@ var CdkSchema = `{
                     "required": [
                         "ChannelGroupName",
                         "ChannelName",
+                        "ContainerType",
                         "OriginEndpointName"
                     ],
                     "type": "object"
@@ -132464,6 +140181,63 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DrmSignaling": {
+                    "type": "string"
+                },
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.FilterConfiguration"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScteDash": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ScteDash"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming"
+                }
+            },
+            "required": [
+                "ManifestName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming": {
+            "additionalProperties": false,
+            "properties": {
+                "TimingMode": {
+                    "type": "string"
+                },
+                "TimingSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -132532,6 +140306,18 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointErrorConditions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -132604,6 +140390,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ScteDash": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkerDash": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.ScteHls": {
             "additionalProperties": false,
             "properties": {
@@ -133396,6 +141191,9 @@ var CdkSchema = `{
         "AWS::MediaTailor::PlaybackConfiguration.AvailSuppression": {
             "additionalProperties": false,
             "properties": {
+                "FillPolicy": {
+                    "type": "string"
+                },
                 "Mode": {
                     "type": "string"
                 },
@@ -134249,102 +142047,312 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AssociatedRoles": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
-                            },
-                            "type": "array"
-                        },
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BackupRetentionPeriod": {
-                            "type": "number"
-                        },
-                        "CopyTagsToSnapshot": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBInstanceParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBPort": {
+                            "type": "number"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ServerlessScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBClusterParameterGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBInstance": {
+            "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": {
+                        "AllowMajorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBClusterParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBInstanceParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBPort": {
-                            "type": "number"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
-                        },
-                        "DeletionProtection": {
+                        "AutoMinorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "EnableCloudwatchLogsExports": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "EngineVersion": {
+                        "AvailabilityZone": {
                             "type": "string"
                         },
-                        "IamAuthEnabled": {
-                            "type": "boolean"
-                        },
-                        "KmsKeyId": {
+                        "DBClusterIdentifier": {
                             "type": "string"
                         },
-                        "PreferredBackupWindow": {
+                        "DBInstanceClass": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
+                        "DBInstanceIdentifier": {
                             "type": "string"
                         },
-                        "RestoreToTime": {
+                        "DBParameterGroupName": {
                             "type": "string"
                         },
-                        "RestoreType": {
+                        "DBSnapshotIdentifier": {
                             "type": "string"
                         },
-                        "ServerlessScalingConfiguration": {
-                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
-                        },
-                        "SnapshotIdentifier": {
+                        "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "SourceDBClusterIdentifier": {
+                        "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
-                        "StorageEncrypted": {
-                            "type": "boolean"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UseLatestRestorableTime": {
-                            "type": "boolean"
-                        },
-                        "VpcSecurityGroupIds": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBCluster"
+                        "AWS::Neptune::DBInstance"
                     ],
                     "type": "string"
                 },
@@ -134358,42 +142366,12 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.DBClusterRole": {
-            "additionalProperties": false,
-            "properties": {
-                "FeatureName": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RoleArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxCapacity": {
-                    "type": "number"
-                },
-                "MinCapacity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "MaxCapacity",
-                "MinCapacity"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBClusterParameterGroup": {
+        "AWS::Neptune::DBParameterGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134456,7 +142434,7 @@ var CdkSchema = `{
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBClusterParameterGroup"
+                        "AWS::Neptune::DBParameterGroup"
                     ],
                     "type": "string"
                 },
@@ -134475,7 +142453,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBInstance": {
+        "AWS::Neptune::DBSubnetGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134510,115 +142488,17 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowMajorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AutoMinorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AvailabilityZone": {
-                            "type": "string"
-                        },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBInstanceClass": {
-                            "type": "string"
-                        },
-                        "DBInstanceIdentifier": {
-                            "type": "string"
-                        },
-                        "DBParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBSnapshotIdentifier": {
+                        "DBSubnetGroupDescription": {
                             "type": "string"
                         },
                         "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DBInstanceClass"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Neptune::DBInstance"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBParameterGroup": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
+                        "SubnetIds": {
                             "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
                                 "type": "string"
                             },
                             "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Family": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "type": "object"
                         },
                         "Tags": {
                             "items": {
@@ -134628,15 +142508,14 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "Description",
-                        "Family",
-                        "Parameters"
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBParameterGroup"
+                        "AWS::Neptune::DBSubnetGroup"
                     ],
                     "type": "string"
                 },
@@ -134655,7 +142534,7 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBSubnetGroup": {
+        "AWS::Neptune::EventSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134690,34 +142569,33 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DBSubnetGroupDescription": {
-                            "type": "string"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
+                        "Enabled": {
+                            "type": "boolean"
                         },
-                        "SubnetIds": {
+                        "EventCategories": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Tags": {
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DBSubnetGroupDescription",
-                        "SubnetIds"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBSubnetGroup"
+                        "AWS::Neptune::EventSubscription"
                     ],
                     "type": "string"
                 },
@@ -134731,8 +142609,7 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -135198,6 +143075,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts": {
+            "additionalProperties": false,
+            "properties": {
+                "TcpIdleTimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::FirewallPolicy.IPSet": {
             "additionalProperties": false,
             "properties": {
@@ -135243,6 +143129,9 @@ var CdkSchema = `{
         "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
             "additionalProperties": false,
             "properties": {
+                "FlowTimeouts": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts"
+                },
                 "RuleOrder": {
                     "type": "string"
                 },
@@ -136148,39 +144037,311 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CoreNetworkId": {
+                        "CoreNetworkId": {
+                            "type": "string"
+                        },
+                        "EdgeLocation": {
+                            "type": "string"
+                        },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange"
+                        },
+                        "ProposedSegmentChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CoreNetworkId",
+                        "EdgeLocation",
+                        "Options",
+                        "TransportAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "SegmentName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer": {
+            "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": {
+                        "BgpOptions": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
+                        },
+                        "ConnectAttachmentId": {
+                            "type": "string"
+                        },
+                        "CoreNetworkAddress": {
+                            "type": "string"
+                        },
+                        "InsideCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PeerAddress": {
+                            "type": "string"
+                        },
+                        "SubnetArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectAttachmentId",
+                        "PeerAddress"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectPeer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "CoreNetworkAsn": {
+                    "type": "number"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BgpConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
+                    },
+                    "type": "array"
+                },
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "InsideCidrBlocks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::CoreNetwork": {
+            "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": {
+                        "Description": {
                             "type": "string"
                         },
-                        "EdgeLocation": {
+                        "GlobalNetworkId": {
                             "type": "string"
                         },
-                        "Options": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
-                        },
-                        "ProposedSegmentChange": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        "PolicyDocument": {
+                            "type": "object"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TransportAttachmentId": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "CoreNetworkId",
-                        "EdgeLocation",
-                        "Options",
-                        "TransportAttachmentId"
+                        "GlobalNetworkId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::NetworkManager::ConnectAttachment"
+                        "AWS::NetworkManager::CoreNetwork"
                     ],
                     "type": "string"
                 },
@@ -136199,264 +144360,55 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "Protocol": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
             "additionalProperties": false,
             "properties": {
-                "AttachmentPolicyRuleNumber": {
+                "Asn": {
                     "type": "number"
                 },
-                "SegmentName": {
+                "EdgeLocation": {
                     "type": "string"
                 },
-                "Tags": {
+                "InsideCidrBlocks": {
                     "items": {
-                        "$ref": "#/definitions/Tag"
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectPeer": {
-            "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": {
-                        "BgpOptions": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
-                        },
-                        "ConnectAttachmentId": {
-                            "type": "string"
-                        },
-                        "CoreNetworkAddress": {
-                            "type": "string"
-                        },
-                        "InsideCidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "PeerAddress": {
-                            "type": "string"
-                        },
-                        "SubnetArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "ConnectAttachmentId",
-                        "PeerAddress"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::ConnectPeer"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "CoreNetworkAsn": {
-                    "type": "number"
-                },
-                "PeerAddress": {
-                    "type": "string"
-                },
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup": {
             "additionalProperties": false,
             "properties": {
-                "BgpConfigurations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
-                    },
-                    "type": "array"
-                },
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "InsideCidrBlocks": {
+                "EdgeLocations": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "PeerAddress": {
+                "Name": {
                     "type": "string"
                 },
-                "Protocol": {
-                    "type": "string"
+                "Segments": {
+                    "$ref": "#/definitions/AWS::NetworkManager::CoreNetwork.Segments"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
             "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "GlobalNetworkId": {
-                            "type": "string"
-                        },
-                        "PolicyDocument": {
-                            "type": "object"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "EdgeLocations": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "GlobalNetworkId"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::CoreNetwork"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
-            "additionalProperties": false,
-            "properties": {
-                "Asn": {
-                    "type": "number"
+                    "type": "array"
                 },
-                "EdgeLocation": {
+                "Name": {
                     "type": "string"
                 },
-                "InsideCidrBlocks": {
+                "SharedSegments": {
                     "items": {
                         "type": "string"
                     },
@@ -136465,19 +144417,16 @@ var CdkSchema = `{
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
+        "AWS::NetworkManager::CoreNetwork.Segments": {
             "additionalProperties": false,
             "properties": {
-                "EdgeLocations": {
+                "SendTo": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Name": {
-                    "type": "string"
-                },
-                "SharedSegments": {
+                "SendVia": {
                     "items": {
                         "type": "string"
                     },
@@ -137060,6 +145009,12 @@ var CdkSchema = `{
                         "CoreNetworkId": {
                             "type": "string"
                         },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange"
                         },
@@ -137100,6 +145055,24 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137297,9 +145270,15 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
                         "PeeringId": {
                             "type": "string"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange"
                         },
@@ -137340,6 +145319,24 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137399,6 +145396,9 @@ var CdkSchema = `{
                         "Options": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.VpcOptions"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedSegmentChange"
                         },
@@ -137446,6 +145446,24 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::VpcAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -138262,6 +146280,22 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::OSIS::Pipeline.VpcAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachToVpc": {
+                    "type": "boolean"
+                },
+                "CidrBlock": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachToVpc",
+                "CidrBlock"
+            ],
+            "type": "object"
+        },
         "AWS::OSIS::Pipeline.VpcEndpoint": {
             "additionalProperties": false,
             "properties": {
@@ -138291,6 +146325,12 @@ var CdkSchema = `{
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "VpcAttachmentOptions": {
+                    "$ref": "#/definitions/AWS::OSIS::Pipeline.VpcAttachmentOptions"
+                },
+                "VpcEndpointManagement": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -139701,6 +147741,9 @@ var CdkSchema = `{
                         "OffPeakWindowOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.OffPeakWindowOptions"
                         },
+                        "SkipShardMigrationWait": {
+                            "type": "boolean"
+                        },
                         "SnapshotOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
                         },
@@ -139754,6 +147797,9 @@ var CdkSchema = `{
                 "InternalUserDatabaseEnabled": {
                     "type": "boolean"
                 },
+                "JWTOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.JWTOptions"
+                },
                 "MasterUserOptions": {
                     "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
                 },
@@ -139902,6 +147948,24 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::OpenSearchService::Domain.JWTOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "PublicKey": {
+                    "type": "string"
+                },
+                "RolesKey": {
+                    "type": "string"
+                },
+                "SubjectKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::OpenSearchService::Domain.LogPublishingOption": {
             "additionalProperties": false,
             "properties": {
@@ -142841,6 +150905,200 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::PCAConnectorSCEP::Challenge": {
+            "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": {
+                        "ConnectorArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConnectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Challenge"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector": {
+            "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": {
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "MobileDeviceManagement": {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Connector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.IntuneConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AzureApplicationId": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AzureApplicationId",
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "Intune": {
+                    "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.IntuneConfiguration"
+                }
+            },
+            "required": [
+                "Intune"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Panorama::ApplicationInstance": {
             "additionalProperties": false,
             "properties": {
@@ -146832,6 +155090,9 @@ var CdkSchema = `{
                         "EnrichmentParameters": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeEnrichmentParameters"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "LogConfiguration": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeLogConfiguration"
                         },
@@ -147036,6 +155297,26 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValue": {
+                    "type": "string"
+                },
+                "DimensionValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName",
+                "DimensionValue",
+                "DimensionValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.EcsContainerOverride": {
             "additionalProperties": false,
             "properties": {
@@ -147233,6 +155514,45 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValue",
+                "MeasureValueType",
+                "MultiMeasureAttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Pipes::Pipe.MultiMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings",
+                "MultiMeasureName"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.NetworkConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -147763,6 +156083,9 @@ var CdkSchema = `{
                 },
                 "StepFunctionStateMachineParameters": {
                     "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetStateMachineParameters"
+                },
+                "TimestreamParameters": {
+                    "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetTimestreamParameters"
                 }
             },
             "type": "object"
@@ -147831,6 +156154,50 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.PipeTargetTimestreamParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "EpochTimeUnit": {
+                    "type": "string"
+                },
+                "MultiMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "SingleMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.SingleMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "TimeFieldType": {
+                    "type": "string"
+                },
+                "TimeValue": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                },
+                "VersionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionMappings",
+                "TimeValue",
+                "VersionValue"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.PlacementConstraint": {
             "additionalProperties": false,
             "properties": {
@@ -147925,6 +156292,26 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.SingleMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureName",
+                "MeasureValue",
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Proton::EnvironmentAccountConnection": {
             "additionalProperties": false,
             "properties": {
@@ -148165,6 +156552,975 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QBusiness::Application": {
+            "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": {
+                        "AttachmentsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AttachmentsConfiguration"
+                        },
+                        "AutoSubscriptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AutoSubscriptionConfiguration"
+                        },
+                        "ClientIdsForOIDC": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.EncryptionConfiguration"
+                        },
+                        "IamIdentityProviderArn": {
+                            "type": "string"
+                        },
+                        "IdentityCenterInstanceArn": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "PersonalizationConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.PersonalizationConfiguration"
+                        },
+                        "QAppsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.QAppsConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AttachmentsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachmentsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AutoSubscriptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoSubscribe": {
+                    "type": "string"
+                },
+                "DefaultSubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoSubscribe"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.PersonalizationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PersonalizationControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PersonalizationControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.QAppsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QAppsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QAppsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentEnrichmentConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SyncSchedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DataSourceVpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "IndexId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeValueOperator": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DateValue": {
+                    "type": "string"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringListValue": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InlineConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration"
+                    },
+                    "type": "array"
+                },
+                "PostExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                },
+                "PreExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.HookConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InvocationCondition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "DocumentContentOperator": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CapacityConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Index.IndexCapacityConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentAttributeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QBusiness::Index.DocumentAttributeConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.DocumentAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Search": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexCapacityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "TextDocumentStatistics": {
+                    "$ref": "#/definitions/AWS::QBusiness::Index.TextDocumentStatistics"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.TextDocumentStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexedTextBytes": {
+                    "type": "number"
+                },
+                "IndexedTextDocumentCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "AuthConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.PluginAuthConfiguration"
+                        },
+                        "CustomPluginConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.CustomPluginConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ServerUrl": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "AuthConfiguration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Plugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.APISchema": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.BasicAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.CustomPluginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSchema": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.APISchema"
+                },
+                "ApiSchemaType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSchema",
+                "ApiSchemaType",
+                "Description"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.PluginAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.BasicAuthConfiguration"
+                },
+                "NoAuthConfiguration": {
+                    "type": "object"
+                },
+                "OAuth2ClientCredentialConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever.RetrieverConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Retriever"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.KendraIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.NativeIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.RetrieverConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KendraIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.KendraIndexConfiguration"
+                },
+                "NativeIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.NativeIndexConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "IdentityProviderConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience.IdentityProviderConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SamplePromptsControlMode": {
+                            "type": "string"
+                        },
+                        "Subtitle": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Title": {
+                            "type": "string"
+                        },
+                        "WelcomeMessage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::WebExperience"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.IdentityProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OpenIDConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration"
+                },
+                "SamlConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.SamlProviderConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsArn": {
+                    "type": "string"
+                },
+                "SecretsRole": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretsArn",
+                "SecretsRole"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.SamlProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthenticationUrl"
+            ],
+            "type": "object"
+        },
         "AWS::QLDB::Ledger": {
             "additionalProperties": false,
             "properties": {
@@ -148550,6 +157906,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.SheetDefinition"
@@ -149344,6 +158703,25 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -149497,6 +158875,9 @@ var CdkSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149581,6 +158962,9 @@ var CdkSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ComboChartSortConfiguration"
                 },
@@ -150598,6 +159982,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -150653,6 +160040,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -150743,6 +160133,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 }
@@ -151074,6 +160467,9 @@ var CdkSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -151230,6 +160626,9 @@ var CdkSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.NumericEqualityFilter"
                 },
@@ -151303,6 +160702,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -151332,6 +160734,9 @@ var CdkSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -151477,6 +160882,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Analysis.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 },
@@ -152682,6 +162090,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153195,6 +162612,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.SmallMultiplesOptions"
                 },
@@ -153557,6 +162977,30 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153943,6 +163387,9 @@ var CdkSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -154789,6 +164236,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -155819,6 +165275,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157193,6 +166658,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -157202,6 +166676,9 @@ var CdkSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DataLabelOptions"
                 },
@@ -157238,6 +166715,21 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157448,6 +166940,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard": {
             "additionalProperties": false,
             "properties": {
@@ -158357,6 +167861,25 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -158510,6 +168033,9 @@ var CdkSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -158594,6 +168120,9 @@ var CdkSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ComboChartSortConfiguration"
                 },
@@ -159828,6 +169357,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -159883,6 +169415,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -159973,6 +169508,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 }
@@ -160331,6 +169869,9 @@ var CdkSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -160487,6 +170028,9 @@ var CdkSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.NumericEqualityFilter"
                 },
@@ -160560,6 +170104,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -160589,6 +170136,9 @@ var CdkSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -160734,6 +170284,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Dashboard.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 },
@@ -161939,6 +171492,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -162452,6 +172014,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.SmallMultiplesOptions"
                 },
@@ -162826,6 +172391,30 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -163212,6 +172801,9 @@ var CdkSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -165106,6 +174698,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166498,6 +176099,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -166507,6 +176117,9 @@ var CdkSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataLabelOptions"
                 },
@@ -166543,6 +176156,21 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166753,6 +176381,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSet": {
             "additionalProperties": false,
             "properties": {
@@ -166827,6 +176467,12 @@ var CdkSchema = `{
                             },
                             "type": "object"
                         },
+                        "FolderArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "ImportMode": {
                             "type": "string"
                         },
@@ -167195,6 +176841,9 @@ var CdkSchema = `{
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.LookbackWindow"
                 }
             },
+            "required": [
+                "LookbackWindow"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
@@ -167319,8 +176968,7 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Alias",
-                "Source"
+                "Alias"
             ],
             "type": "object"
         },
@@ -167352,6 +177000,11 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Size",
+                "SizeUnit"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.NewDefaultValues": {
@@ -167457,6 +177110,9 @@ var CdkSchema = `{
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.IncrementalRefresh"
                 }
             },
+            "required": [
+                "IncrementalRefresh"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.RelationalTable": {
@@ -167690,8 +177346,30 @@ var CdkSchema = `{
                 },
                 "TagColumnOperation": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                },
+                "UntagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UntagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UntagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "TagNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "TagNames"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.UploadSettings": {
@@ -167796,6 +177474,10 @@ var CdkSchema = `{
                             "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -167814,7 +177496,8 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -168029,6 +177712,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.IdentityCenterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableIdentityPropagation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -168161,6 +177853,30 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.RedshiftIAMParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoCreateDatabaseUser": {
+                    "type": "boolean"
+                },
+                "DatabaseGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DatabaseUser": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.RedshiftParameters": {
             "additionalProperties": false,
             "properties": {
@@ -168173,6 +177889,12 @@ var CdkSchema = `{
                 "Host": {
                     "type": "string"
                 },
+                "IAMParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftIAMParameters"
+                },
+                "IdentityCenterConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.IdentityCenterConfiguration"
+                },
                 "Port": {
                     "type": "number"
                 }
@@ -168193,6 +177915,9 @@ var CdkSchema = `{
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -168356,6 +178081,113 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Folder": {
+            "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": {
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "FolderId": {
+                            "type": "string"
+                        },
+                        "FolderType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentFolderArn": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Folder.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SharingModel": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Folder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Folder.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::RefreshSchedule": {
             "additionalProperties": false,
             "properties": {
@@ -169352,6 +179184,25 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -169544,6 +179395,9 @@ var CdkSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -169628,6 +179482,9 @@ var CdkSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ComboChartSortConfiguration"
                 },
@@ -170621,6 +180478,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -170676,6 +180536,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -170766,6 +180629,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 }
@@ -171097,6 +180963,9 @@ var CdkSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -171253,6 +181122,9 @@ var CdkSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.NumericEqualityFilter"
                 },
@@ -171326,6 +181198,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -171355,6 +181230,9 @@ var CdkSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -171500,6 +181378,9 @@ var CdkSchema = `{
         "AWS::QuickSight::Template.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 },
@@ -172705,6 +182586,15 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173199,6 +183089,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.SmallMultiplesOptions"
                 },
@@ -173561,6 +183454,30 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173947,6 +183864,9 @@ var CdkSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -174763,6 +184683,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -175793,6 +185722,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -176528,6 +186466,9 @@ var CdkSchema = `{
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.SheetDefinition"
@@ -177302,6 +187243,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -177311,6 +187261,9 @@ var CdkSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DataLabelOptions"
                 },
@@ -177347,6 +187300,21 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -177557,6 +187525,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Theme": {
             "additionalProperties": false,
             "properties": {
@@ -178288,6 +188268,9 @@ var CdkSchema = `{
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "Expression": {
                     "type": "string"
                 },
@@ -178394,6 +188377,9 @@ var CdkSchema = `{
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "IsIncludedInTopic": {
                     "type": "boolean"
                 },
@@ -179079,9 +189065,15 @@ var CdkSchema = `{
                         "EnableIAMDatabaseAuthentication": {
                             "type": "boolean"
                         },
+                        "EnableLocalWriteForwarding": {
+                            "type": "boolean"
+                        },
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineMode": {
                             "type": "string"
                         },
@@ -179531,6 +189523,9 @@ var CdkSchema = `{
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180567,6 +190562,9 @@ var CdkSchema = `{
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180578,6 +190576,12 @@ var CdkSchema = `{
                         },
                         "StorageEncrypted": {
                             "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "type": "object"
@@ -181286,6 +191290,15 @@ var CdkSchema = `{
                 "BucketName": {
                     "type": "string"
                 },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogExports": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "S3KeyPrefix": {
                     "type": "string"
                 }
@@ -184707,6 +194720,15 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AcceptRoleSessionName": {
+                            "type": "boolean"
+                        },
+                        "AttributeMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RolesAnywhere::Profile.AttributeMapping"
+                            },
+                            "type": "array"
+                        },
                         "DurationSeconds": {
                             "type": "number"
                         },
@@ -184768,6 +194790,37 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::RolesAnywhere::Profile.AttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateField": {
+                    "type": "string"
+                },
+                "MappingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RolesAnywhere::Profile.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateField",
+                "MappingRules"
+            ],
+            "type": "object"
+        },
+        "AWS::RolesAnywhere::Profile.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Specifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Specifier"
+            ],
+            "type": "object"
+        },
         "AWS::RolesAnywhere::TrustAnchor": {
             "additionalProperties": false,
             "properties": {
@@ -186999,6 +197052,9 @@ var CdkSchema = `{
                 "FirewallDomainListId": {
                     "type": "string"
                 },
+                "FirewallDomainRedirectionAction": {
+                    "type": "string"
+                },
                 "Priority": {
                     "type": "number"
                 },
@@ -187594,6 +197650,9 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DelegationRecord": {
+                            "type": "string"
+                        },
                         "DomainName": {
                             "type": "string"
                         },
@@ -187620,7 +197679,6 @@ var CdkSchema = `{
                         }
                     },
                     "required": [
-                        "DomainName",
                         "RuleType"
                     ],
                     "type": "object"
@@ -188558,6 +198616,9 @@ var CdkSchema = `{
                         "$ref": "#/definitions/AWS::S3::Bucket.Rule"
                     },
                     "type": "array"
+                },
+                "TransitionDefaultMinimumObjectSize": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -190174,6 +200235,9 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.BucketEncryption"
+                        },
                         "BucketName": {
                             "type": "string"
                         },
@@ -190206,11 +200270,53 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
             ],
             "type": "object"
         },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
         "AWS::S3ObjectLambda::AccessPoint": {
             "additionalProperties": false,
             "properties": {
@@ -191224,6 +201330,18 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventBusArn"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
             "additionalProperties": false,
             "properties": {
@@ -191233,6 +201351,9 @@ var CdkSchema = `{
                 "Enabled": {
                     "type": "boolean"
                 },
+                "EventBridgeDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination"
+                },
                 "KinesisFirehoseDestination": {
                     "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
                 },
@@ -191579,6 +201700,1175 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::SES::MailManagerAddonInstance": {
+            "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": {
+                        "AddonSubscriptionId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonSubscriptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerAddonSubscription": {
+            "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": {
+                        "AddonName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive": {
+            "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": {
+                        "ArchiveName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Retention": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive.ArchiveRetention"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerArchive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive.ArchiveRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "RetentionPeriod": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RetentionPeriod"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint": {
+            "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": {
+                        "IngressPointConfiguration": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint.IngressPointConfiguration"
+                        },
+                        "IngressPointName": {
+                            "type": "string"
+                        },
+                        "RuleSetId": {
+                            "type": "string"
+                        },
+                        "StatusToUpdate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RuleSetId",
+                        "TrafficPolicyId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerIngressPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint.IngressPointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SmtpPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay": {
+            "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": {
+                        "Authentication": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay.RelayAuthentication"
+                        },
+                        "RelayName": {
+                            "type": "string"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "ServerName",
+                        "ServerPort"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRelay"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay.RelayAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "NoAuthentication": {
+                    "type": "object"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet": {
+            "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": {
+                        "RuleSetName": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ArchiveAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "TargetArchive": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArchive"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.DeliverToMailboxAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailboxArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MailboxArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RelayAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailFrom": {
+                    "type": "string"
+                },
+                "Relay": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Relay"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ReplaceRecipientAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplaceWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleAction"
+                    },
+                    "type": "array"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Unless": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeader": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.AddHeaderAction"
+                },
+                "Archive": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ArchiveAction"
+                },
+                "DeliverToMailbox": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.DeliverToMailboxAction"
+                },
+                "Drop": {
+                    "type": "object"
+                },
+                "Relay": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RelayAction"
+                },
+                "ReplaceRecipient": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ReplaceRecipientAction"
+                },
+                "Send": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.SendAction"
+                },
+                "WriteToS3": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.S3Action"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanExpression"
+                },
+                "DmarcExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleDmarcExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpExpression"
+                },
+                "NumberExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberExpression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringExpression"
+                },
+                "VerdictExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleDmarcExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MimeHeaderAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Analysis"
+                },
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                },
+                "S3SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.SendAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy": {
+            "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": {
+                        "DefaultAction": {
+                            "type": "string"
+                        },
+                        "MaxMessageSizeBytes": {
+                            "type": "number"
+                        },
+                        "PolicyStatements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyStatement"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "PolicyStatements"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerTrafficPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressAnalysis"
+                }
+            },
+            "required": [
+                "Analysis"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringExpression"
+                },
+                "TlsExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Conditions"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ReceiptFilter": {
             "additionalProperties": false,
             "properties": {
@@ -191870,6 +203160,9 @@ var CdkSchema = `{
                 "BucketName": {
                     "type": "string"
                 },
+                "IamRoleArn": {
+                    "type": "string"
+                },
                 "KmsKeyArn": {
                     "type": "string"
                 },
@@ -195021,6 +206314,342 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SSMQuickSetup::ConfigurationManager": {
+            "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": {
+                        "ConfigurationDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationDefinitions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMQuickSetup::ConfigurationManager"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeploymentAdministrationRoleArn": {
+                    "type": "string"
+                },
+                "LocalDeploymentExecutionRoleName": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "TypeVersion": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.StatusSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "LastUpdatedAt": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StatusDetails": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusMessage": {
+                    "type": "string"
+                },
+                "StatusType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LastUpdatedAt",
+                "StatusType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application": {
+            "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": {
+                        "ApplicationProviderArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PortalOptions": {
+                            "$ref": "#/definitions/AWS::SSO::Application.PortalOptionsConfiguration"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationProviderArn",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application.PortalOptionsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SignInOptions": {
+                    "$ref": "#/definitions/AWS::SSO::Application.SignInOptions"
+                },
+                "Visibility": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSO::Application.SignInOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationUrl": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Origin"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::ApplicationAssignment": {
+            "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"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "PrincipalId",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::ApplicationAssignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::Assignment": {
             "additionalProperties": false,
             "properties": {
@@ -195106,6 +206735,73 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SSO::Instance": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -195243,55 +206939,168 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CustomerManagedPolicyReferences": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InlinePolicy": {
-                            "type": "object"
-                        },
-                        "InstanceArn": {
+                        "CustomerManagedPolicyReferences": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
+                        },
+                        "RelayStateType": {
+                            "type": "string"
+                        },
+                        "SessionDuration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::PermissionSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.PermissionsBoundary": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedPolicyReference": {
+                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                },
+                "ManagedPolicyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::App": {
+            "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": {
+                        "AppName": {
                             "type": "string"
                         },
-                        "ManagedPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
+                        "AppType": {
                             "type": "string"
                         },
-                        "PermissionsBoundary": {
-                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
-                        },
-                        "RelayStateType": {
+                        "DomainId": {
                             "type": "string"
                         },
-                        "SessionDuration": {
-                            "type": "string"
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "InstanceArn",
-                        "Name"
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SSO::PermissionSet"
+                        "AWS::SageMaker::App"
                     ],
                     "type": "string"
                 },
@@ -195310,34 +207119,25 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+        "AWS::SageMaker::App.ResourceSpec": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "InstanceType": {
                     "type": "string"
                 },
-                "Path": {
+                "LifecycleConfigArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::SSO::PermissionSet.PermissionsBoundary": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomerManagedPolicyReference": {
-                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
                 },
-                "ManagedPolicyArn": {
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::App": {
+        "AWS::SageMaker::AppImageConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195372,39 +207172,33 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppName": {
+                        "AppImageConfigName": {
                             "type": "string"
                         },
-                        "AppType": {
-                            "type": "string"
+                        "CodeEditorAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
                         },
-                        "DomainId": {
-                            "type": "string"
+                        "JupyterLabAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
                         },
-                        "ResourceSpec": {
-                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserProfileName": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "AppName",
-                        "AppType",
-                        "DomainId",
-                        "UserProfileName"
+                        "AppImageConfigName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::App"
+                        "AWS::SageMaker::AppImageConfig"
                     ],
                     "type": "string"
                 },
@@ -195423,22 +207217,113 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::App.ResourceSpec": {
+        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceType": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "SageMakerImageArn": {
+                "Value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
                 },
-                "SageMakerImageVersionArn": {
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig": {
+        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
+                },
+                "KernelSpecs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "KernelSpecs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "DisplayName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Cluster": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195473,33 +207358,39 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppImageConfigName": {
+                        "ClusterName": {
                             "type": "string"
                         },
-                        "CodeEditorAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
+                        "InstanceGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceGroup"
+                            },
+                            "type": "array"
                         },
-                        "JupyterLabAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
+                        "NodeRecovery": {
+                            "type": "string"
                         },
-                        "KernelGatewayImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        "Orchestrator": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.Orchestrator"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppImageConfigName"
+                        "InstanceGroups"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::AppImageConfig"
+                        "AWS::SageMaker::Cluster"
                     ],
                     "type": "string"
                 },
@@ -195518,109 +207409,129 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterEbsVolumeConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "VolumeSizeInGB": {
+                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+        "AWS::SageMaker::Cluster.ClusterInstanceGroup": {
             "additionalProperties": false,
             "properties": {
-                "ContainerArguments": {
+                "CurrentCount": {
+                    "type": "number"
+                },
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceGroupName": {
+                    "type": "string"
+                },
+                "InstanceStorageConfigs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceStorageConfig"
                     },
                     "type": "array"
                 },
-                "ContainerEntrypoint": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LifeCycleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterLifeCycleConfig"
+                },
+                "OnStartDeepHealthChecks": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "ContainerEnvironmentVariables": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
-                    },
-                    "type": "array"
+                "ThreadsPerCore": {
+                    "type": "number"
                 }
             },
+            "required": [
+                "ExecutionRole",
+                "InstanceCount",
+                "InstanceGroupName",
+                "InstanceType",
+                "LifeCycleConfig"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+        "AWS::SageMaker::Cluster.ClusterInstanceStorageConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "EbsVolumeConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterEbsVolumeConfig"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+        "AWS::SageMaker::Cluster.ClusterLifeCycleConfig": {
             "additionalProperties": false,
             "properties": {
-                "DefaultGid": {
-                    "type": "number"
-                },
-                "DefaultUid": {
-                    "type": "number"
+                "OnCreate": {
+                    "type": "string"
                 },
-                "MountPath": {
+                "SourceS3Uri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "OnCreate",
+                "SourceS3Uri"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "ClusterArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ClusterArn"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+        "AWS::SageMaker::Cluster.Orchestrator": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
-                },
-                "KernelSpecs": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
-                    },
-                    "type": "array"
+                "Eks": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig"
                 }
             },
             "required": [
-                "KernelSpecs"
+                "Eks"
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+        "AWS::SageMaker::Cluster.VpcConfig": {
             "additionalProperties": false,
             "properties": {
-                "DisplayName": {
-                    "type": "string"
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Name": {
-                    "type": "string"
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name"
+                "SecurityGroupIds",
+                "Subnets"
             ],
             "type": "object"
         },
@@ -196416,9 +208327,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
@@ -196512,9 +208435,21 @@ var CdkSchema = `{
         "AWS::SageMaker::Domain.DefaultSpaceSettings": {
             "additionalProperties": false,
             "properties": {
+                "CustomFileSystemConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomFileSystemConfig"
+                    },
+                    "type": "array"
+                },
+                "CustomPosixUserConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.CustomPosixUserConfig"
+                },
                 "ExecutionRole": {
                     "type": "string"
                 },
+                "JupyterLabAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterLabAppSettings"
+                },
                 "JupyterServerAppSettings": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
                 },
@@ -196526,6 +208461,9 @@ var CdkSchema = `{
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "SpaceStorageSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.DefaultSpaceStorageSettings"
                 }
             },
             "required": [
@@ -196590,9 +208528,30 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CodeRepository"
@@ -196622,6 +208581,12 @@ var CdkSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196637,6 +208602,12 @@ var CdkSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196722,6 +208693,24 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Domain.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -196772,6 +208761,9 @@ var CdkSchema = `{
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.StudioWebPortalSettings"
                 }
             },
             "required": [
@@ -197856,6 +209848,9 @@ var CdkSchema = `{
                         },
                         "VendorGuidance": {
                             "type": "string"
+                        },
+                        "Version": {
+                            "type": "number"
                         }
                     },
                     "required": [
@@ -198343,6 +210338,97 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::MlflowTrackingServer": {
+            "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": {
+                        "ArtifactStoreUri": {
+                            "type": "string"
+                        },
+                        "AutomaticModelRegistration": {
+                            "type": "boolean"
+                        },
+                        "MlflowVersion": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingServerName": {
+                            "type": "string"
+                        },
+                        "TrackingServerSize": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ArtifactStoreUri",
+                        "RoleArn",
+                        "TrackingServerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MlflowTrackingServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model": {
             "additionalProperties": false,
             "properties": {
@@ -198431,6 +210517,22 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Model.AdditionalModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.S3DataSource"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "S3DataSource"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ContainerDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -198467,6 +210569,18 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Model.HubAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HubContentArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HubContentArn"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ImageConfig": {
             "additionalProperties": false,
             "properties": {
@@ -198545,6 +210659,9 @@ var CdkSchema = `{
                 "CompressionType": {
                     "type": "string"
                 },
+                "HubAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.HubAccessConfig"
+                },
                 "ModelAccessConfig": {
                     "$ref": "#/definitions/AWS::SageMaker::Model.ModelAccessConfig"
                 },
@@ -200066,6 +212183,9 @@ var CdkSchema = `{
                         "ModelApprovalStatus": {
                             "type": "string"
                         },
+                        "ModelCard": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelCard"
+                        },
                         "ModelMetrics": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelMetrics"
                         },
@@ -200087,12 +212207,18 @@ var CdkSchema = `{
                         "SamplePayloadUrl": {
                             "type": "string"
                         },
+                        "SecurityConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SecurityConfig"
+                        },
                         "SkipModelValidation": {
                             "type": "string"
                         },
                         "SourceAlgorithmSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SourceAlgorithmSpecification"
                         },
+                        "SourceUri": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -200375,6 +212501,34 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceptEula": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AcceptEula"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.ModelCard": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCardContent": {
+                    "type": "string"
+                },
+                "ModelCardStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ModelCardContent",
+                "ModelCardStatus"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelDataQuality": {
             "additionalProperties": false,
             "properties": {
@@ -200387,6 +212541,15 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.S3ModelDataSource"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelInput": {
             "additionalProperties": false,
             "properties": {
@@ -200444,6 +212607,9 @@ var CdkSchema = `{
                 "ImageDigest": {
                     "type": "string"
                 },
+                "ModelDataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelDataSource"
+                },
                 "ModelDataUrl": {
                     "type": "string"
                 },
@@ -200518,6 +212684,41 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.S3ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionType": {
+                    "type": "string"
+                },
+                "ModelAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelAccessConfig"
+                },
+                "S3DataType": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionType",
+                "S3DataType",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.SecurityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKeyId"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.SourceAlgorithm": {
             "additionalProperties": false,
             "properties": {
@@ -202340,6 +214541,12 @@ var CdkSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202355,6 +214562,12 @@ var CdkSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202377,6 +214590,9 @@ var CdkSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202386,18 +214602,42 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceAppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceIdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceCodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
                 }
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceIdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceJupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Space.CodeRepository"
@@ -202461,6 +214701,85 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::StudioLifecycleConfig": {
+            "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": {
+                        "StudioLifecycleConfigAppType": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigContent": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StudioLifecycleConfigAppType",
+                        "StudioLifecycleConfigContent",
+                        "StudioLifecycleConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::StudioLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile": {
             "additionalProperties": false,
             "properties": {
@@ -202545,9 +214864,21 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
@@ -202662,9 +214993,30 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CodeRepository"
@@ -202694,6 +215046,12 @@ var CdkSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202709,6 +215067,12 @@ var CdkSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202731,6 +215095,9 @@ var CdkSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202755,6 +215122,24 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -202802,6 +215187,9 @@ var CdkSchema = `{
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.StudioWebPortalSettings"
                 }
             },
             "type": "object"
@@ -203871,6 +216259,13 @@ var CdkSchema = `{
                             "type": "object"
                         }
                     },
+                    "required": [
+                        "Actions",
+                        "Criteria",
+                        "Description",
+                        "RuleName",
+                        "RuleOrder"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -203889,7 +216284,8 @@ var CdkSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -204311,6 +216707,210 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::ConfigurationPolicy": {
+            "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": {
+                        "ConfigurationPolicy": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.Policy"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicy",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ConfigurationPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityHub": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecurityControlId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EnabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlCustomParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledStandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlsConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration"
+                },
+                "ServiceEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::DelegatedAdmin": {
             "additionalProperties": false,
             "properties": {
@@ -204376,6 +216976,77 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::FindingAggregator": {
+            "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": {
+                        "RegionLinkingMode": {
+                            "type": "string"
+                        },
+                        "Regions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegionLinkingMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::FindingAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
@@ -205237,6 +217908,150 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::OrganizationConfiguration": {
+            "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": {
+                        "AutoEnable": {
+                            "type": "boolean"
+                        },
+                        "AutoEnableStandards": {
+                            "type": "string"
+                        },
+                        "ConfigurationType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoEnable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::OrganizationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::PolicyAssociation": {
+            "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": {
+                        "ConfigurationPolicyId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicyId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::PolicyAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::ProductSubscription": {
             "additionalProperties": false,
             "properties": {
@@ -205272,18 +218087,98 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ProductArn": {
+                        "ProductArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ProductSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl": {
+            "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": {
+                        "LastUpdateReason": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityControlArn": {
+                            "type": "string"
+                        },
+                        "SecurityControlId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ProductArn"
+                        "Parameters"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
+                        "AWS::SecurityHub::SecurityControl"
                     ],
                     "type": "string"
                 },
@@ -205302,6 +218197,60 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::SecurityControl.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
@@ -205751,6 +218700,112 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityLake::SubscriberNotification": {
+            "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": {
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.NotificationConfiguration"
+                        },
+                        "SubscriberArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationConfiguration",
+                        "SubscriberArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityLake::SubscriberNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationApiKeyName": {
+                    "type": "string"
+                },
+                "AuthorizationApiKeyValue": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "TargetRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "TargetRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpsNotificationConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration"
+                },
+                "SqsNotificationConfiguration": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
@@ -208657,6 +221712,9 @@ var CdkSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity.EncryptionConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -208693,6 +221751,24 @@ var CdkSchema = `{
             ],
             "type": "object"
         },
+        "AWS::StepFunctions::Activity.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::Activity.TagsEntry": {
             "additionalProperties": false,
             "properties": {
@@ -208762,6 +221838,9 @@ var CdkSchema = `{
                             },
                             "type": "object"
                         },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.EncryptionConfiguration"
+                        },
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
                         },
@@ -208819,6 +221898,24 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::StepFunctions::StateMachine.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::StateMachine.LogDestination": {
             "additionalProperties": false,
             "properties": {
@@ -209353,6 +222450,12 @@ var CdkSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "ResourcesToReplicateTags": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "RunConfig": {
                             "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
                         },
@@ -209684,6 +222787,9 @@ var CdkSchema = `{
                             },
                             "type": "array"
                         },
+                        "DatabaseArn": {
+                            "type": "string"
+                        },
                         "Instances": {
                             "items": {
                                 "type": "string"
@@ -210649,6 +223755,9 @@ var CdkSchema = `{
                         "LoggingRole": {
                             "type": "string"
                         },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
                         "SftpConfig": {
                             "$ref": "#/definitions/AWS::Transfer::Connector.SftpConfig"
                         },
@@ -211350,6 +224459,10 @@ var CdkSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "DestinationFileLocation",
+                "Type"
+            ],
             "type": "object"
         },
         "AWS::Transfer::Workflow.DeleteStepDetails": {
@@ -211577,13 +224690,93 @@ var CdkSchema = `{
             "properties": {
                 "CognitoUserPoolConfiguration": {
                     "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                },
+                "OpenIdConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audiences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdPrefix": {
+                    "type": "string"
+                },
+                "GroupConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "TokenSelection": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection"
                 }
             },
             "required": [
-                "CognitoUserPoolConfiguration"
+                "Issuer",
+                "TokenSelection"
             ],
             "type": "object"
         },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupClaim": {
+                    "type": "string"
+                },
+                "GroupEntityType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupClaim",
+                "GroupEntityType"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration"
+                },
+                "IdentityTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::VerifiedPermissions::Policy": {
             "additionalProperties": false,
             "properties": {
@@ -218277,6 +231470,140 @@ var CdkSchema = `{
             },
             "type": "object"
         },
+        "AWS::WorkSpaces::WorkspacesPool": {
+            "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": {
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.ApplicationSettings"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Capacity": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.Capacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.TimeoutSettings"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "Capacity",
+                        "DirectoryId",
+                        "PoolName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::WorkspacesPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SettingsGroup": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.Capacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredUserSessions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredUserSessions"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.TimeoutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "IdleDisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "MaxUserDurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WorkSpacesThinClient::Environment": {
             "additionalProperties": false,
             "properties": {
@@ -218321,6 +231648,12 @@ var CdkSchema = `{
                         "DesktopEndpoint": {
                             "type": "string"
                         },
+                        "DeviceCreationTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "KmsKeyArn": {
                             "type": "string"
                         },
@@ -218533,6 +231866,12 @@ var CdkSchema = `{
                         },
                         "PortalArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -219059,6 +232398,9 @@ var CdkSchema = `{
                         "CustomerManagedKey": {
                             "type": "string"
                         },
+                        "DeepLinkAllowed": {
+                            "type": "string"
+                        },
                         "DisconnectTimeoutInMinutes": {
                             "type": "number"
                         },
@@ -219786,6 +233128,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::APS::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ARCZonalShift::ZonalAutoshiftConfiguration"
                         },
@@ -220062,6 +233407,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppSync::SourceApiAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppTest::TestCase"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
                         },
@@ -220071,6 +233419,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::ApplicationInsights::Application"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Athena::CapacityReservation"
                         },
@@ -220170,12 +233521,30 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Bedrock::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::Guardrail"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::GuardrailVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Prompt"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::PromptVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::BillingConductor::BillingGroup"
                         },
@@ -220239,6 +233608,12 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::Membership"
                         },
@@ -220515,6 +233890,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Config::StoredQuery"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::AgentStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::ApprovedOrigin"
                         },
@@ -220578,6 +233956,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::View"
                         },
@@ -220725,18 +234106,30 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::DataZone::Environment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentBlueprintConfiguration"
                         },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentProfile"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::GroupProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::Project"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::SubscriptionTarget"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::UserProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Farm"
                         },
@@ -220749,6 +234142,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Deadline::MeteredProduct"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Deadline::Monitor"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Queue"
                         },
@@ -221478,6 +234874,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Glue::Trigger"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Glue::Workflow"
                         },
@@ -221556,6 +234955,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::IPSet"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan"
+                        },
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::Master"
                         },
@@ -221631,6 +235033,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::IVS::PlaybackRestrictionPolicy"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PublicKey"
+                        },
                         {
                             "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
                         },
@@ -221940,6 +235345,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::KendraRanking::ExecutionPlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::ResourcePolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kinesis::Stream"
                         },
@@ -222027,6 +235435,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Lambda::Version"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::LaunchWizard::Deployment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Lex::Bot"
                         },
@@ -222237,6 +235648,24 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Channel"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Input"
                         },
@@ -222249,6 +235678,15 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Network"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SdiSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SignalMap"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaPackage::Asset"
                         },
@@ -222330,6 +235768,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::EventSubscription"
+                        },
                         {
                             "$ref": "#/definitions/AWS::NeptuneGraph::Graph"
                         },
@@ -222507,6 +235948,12 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::PCAConnectorAD::TemplateGroupAccessControlEntry"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Challenge"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
                         },
@@ -222615,6 +236062,24 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Proton::ServiceTemplate"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QLDB::Ledger"
                         },
@@ -222633,6 +236098,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::QuickSight::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Folder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QuickSight::RefreshSchedule"
                         },
@@ -222960,6 +236428,27 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SES::EmailIdentity"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SES::ReceiptFilter"
                         },
@@ -223041,9 +236530,21 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::ApplicationAssignment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::Assignment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Instance"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
                         },
@@ -223056,6 +236557,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
                         },
@@ -223092,6 +236596,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::InferenceExperiment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MlflowTrackingServer"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Model"
                         },
@@ -223131,6 +236638,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Space"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::StudioLifecycleConfig"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::UserProfile"
                         },
@@ -223158,18 +236668,33 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::FindingAggregator"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Insight"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::OrganizationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::PolicyAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::SecurityControl"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
@@ -223182,6 +236707,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityLake::Subscriber"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
                         },
@@ -223473,6 +237001,9 @@ var CdkSchema = `{
                         {
                             "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool"
+                        },
                         {
                             "$ref": "#/definitions/AWS::WorkSpacesThinClient::Environment"
                         },
diff --git a/schema/cdk.schema.json b/schema/cdk.schema.json
index edab74ef4a..22938b7d6e 100644
--- a/schema/cdk.schema.json
+++ b/schema/cdk.schema.json
@@ -536,6 +536,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.CrlDistributionPointExtensionConfiguration": {
@@ -592,7 +595,6 @@
                 }
             },
             "required": [
-                "NameAssigner",
                 "PartyName"
             ],
             "type": "object"
@@ -670,6 +672,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.OtherName": {
@@ -1227,6 +1232,71 @@
             },
             "type": "object"
         },
+        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus": {
+            "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": {
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::ARCZonalShift::ZonalAutoshiftConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -1609,11 +1679,9 @@
                         }
                     },
                     "required": [
-                        "AutoMinorVersionUpgrade",
                         "BrokerName",
                         "DeploymentMode",
                         "EngineType",
-                        "EngineVersion",
                         "HostInstanceType",
                         "PubliclyAccessible",
                         "Users"
@@ -1862,7 +1930,6 @@
                     "required": [
                         "Data",
                         "EngineType",
-                        "EngineVersion",
                         "Name"
                     ],
                     "type": "object"
@@ -2036,6 +2103,9 @@
                         "BuildSpec": {
                             "type": "string"
                         },
+                        "CacheConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.CacheConfig"
+                        },
                         "CustomHeaders": {
                             "type": "string"
                         },
@@ -2165,6 +2235,15 @@
             },
             "type": "object"
         },
+        "AWS::Amplify::App.CacheConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Amplify::App.CustomRule": {
             "additionalProperties": false,
             "properties": {
@@ -6484,12 +6563,30 @@
                             "type": "string"
                         },
                         "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "RequestTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "ResponseParameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameterMap"
+                                }
+                            },
                             "type": "object"
                         },
                         "TemplateSelectionExpression": {
@@ -6539,13 +6636,9 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "Destination",
-                "Source"
-            ],
             "type": "object"
         },
-        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+        "AWS::ApiGatewayV2::Integration.ResponseParameterMap": {
             "additionalProperties": false,
             "properties": {
                 "ResponseParameters": {
@@ -10100,7 +10193,8 @@
                     "required": [
                         "ApplicationSourceConfig",
                         "Description",
-                        "Name"
+                        "Name",
+                        "Namespace"
                     ],
                     "type": "object"
                 },
@@ -16541,7 +16635,7 @@
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget": {
+        "AWS::AppTest::TestCase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -16576,46 +16670,37 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MaxCapacity": {
-                            "type": "number"
-                        },
-                        "MinCapacity": {
-                            "type": "number"
-                        },
-                        "ResourceId": {
-                            "type": "string"
-                        },
-                        "RoleARN": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ScalableDimension": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ScheduledActions": {
+                        "Steps": {
                             "items": {
-                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                                "$ref": "#/definitions/AWS::AppTest::TestCase.Step"
                             },
                             "type": "array"
                         },
-                        "ServiceNamespace": {
-                            "type": "string"
-                        },
-                        "SuspendedState": {
-                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MaxCapacity",
-                        "MinCapacity",
-                        "ResourceId",
-                        "ScalableDimension",
-                        "ServiceNamespace"
+                        "Name",
+                        "Steps"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                        "AWS::AppTest::TestCase"
                     ],
                     "type": "string"
                 },
@@ -16634,62 +16719,542 @@
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+        "AWS::AppTest::TestCase.Batch": {
             "additionalProperties": false,
             "properties": {
-                "MaxCapacity": {
-                    "type": "number"
+                "BatchJobName": {
+                    "type": "string"
                 },
-                "MinCapacity": {
-                    "type": "number"
+                "BatchJobParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "BatchJobName"
+            ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+        "AWS::AppTest::TestCase.CloudFormationAction": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
+                "ActionType": {
                     "type": "string"
                 },
-                "ScalableTargetAction": {
-                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.CompareAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Input"
                 },
-                "Schedule": {
+                "Output": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Output"
+                }
+            },
+            "required": [
+                "Input"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ccsid": {
                     "type": "string"
                 },
-                "ScheduledActionName": {
+                "Format": {
                     "type": "string"
                 },
-                "StartTime": {
+                "Length": {
+                    "type": "number"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Timezone": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Schedule",
-                "ScheduledActionName"
+                "Ccsid",
+                "Format",
+                "Length",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+        "AWS::AppTest::TestCase.DatabaseCDC": {
             "additionalProperties": false,
             "properties": {
-                "DynamicScalingInSuspended": {
-                    "type": "boolean"
+                "SourceMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.SourceDatabaseMetadata"
                 },
-                "DynamicScalingOutSuspended": {
-                    "type": "boolean"
+                "TargetMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TargetDatabaseMetadata"
+                }
+            },
+            "required": [
+                "SourceMetadata",
+                "TargetMetadata"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.FileMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppTest::TestCase.DataSet"
+                    },
+                    "type": "array"
                 },
-                "ScheduledScalingSuspended": {
+                "DatabaseCDC": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.DatabaseCDC"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.InputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.InputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.FileMetadata"
+                },
+                "SourceLocation": {
+                    "type": "string"
+                },
+                "TargetLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileMetadata",
+                "SourceLocation",
+                "TargetLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2ManagedActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ForceStop": {
                     "type": "boolean"
+                },
+                "ImportDataSetLocation": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalingPolicy": {
+        "AWS::AppTest::TestCase.M2ManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2NonManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionType"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DmsTaskArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Batch": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Batch"
+                },
+                "Tn3270": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TN3270"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.OutputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.OutputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.ResourceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CloudFormationAction"
+                },
+                "M2ManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedApplicationAction"
+                },
+                "M2NonManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2NonManagedApplicationAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Script": {
+            "additionalProperties": false,
+            "properties": {
+                "ScriptLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScriptLocation",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.SourceDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Step": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.StepAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.StepAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CompareAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CompareAction"
+                },
+                "MainframeAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeAction"
+                },
+                "ResourceAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.ResourceAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TN3270": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Script": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Script"
+                }
+            },
+            "required": [
+                "Script"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TargetDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TestCaseLatestVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Status",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "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": {
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MinCapacity": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScheduledActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "SuspendedState": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        }
+                    },
+                    "required": [
+                        "MaxCapacity",
+                        "MinCapacity",
+                        "ResourceId",
+                        "ScalableDimension",
+                        "ServiceNamespace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "ScalableTargetAction": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                },
+                "Schedule": {
+                    "type": "string"
+                },
+                "ScheduledActionName": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule",
+                "ScheduledActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicScalingInSuspended": {
+                    "type": "boolean"
+                },
+                "DynamicScalingOutSuspended": {
+                    "type": "boolean"
+                },
+                "ScheduledScalingSuspended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17462,7 +18027,7 @@
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation": {
+        "AWS::ApplicationSignals::ServiceLevelObjective": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17497,31 +18062,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CapacityAssignmentConfiguration": {
-                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Goal": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Goal"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "RequestBasedSli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli"
+                        },
+                        "Sli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Sli"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TargetDpus": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "Name",
-                        "TargetDpus"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Athena::CapacityReservation"
+                        "AWS::ApplicationSignals::ServiceLevelObjective"
                     ],
                     "type": "string"
                 },
@@ -17540,37 +18110,378 @@
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval": {
             "additionalProperties": false,
             "properties": {
-                "WorkgroupNames": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Duration",
+                "DurationUnit",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Goal": {
+            "additionalProperties": false,
+            "properties": {
+                "AttainmentGoal": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Interval"
+                },
+                "WarningThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Interval": {
+            "additionalProperties": false,
+            "properties": {
+                "CalendarInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval"
+                },
+                "RollingInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Dimension"
                     },
                     "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "WorkgroupNames"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricStat": {
             "additionalProperties": false,
             "properties": {
-                "CapacityAssignments": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "BadCountMetric": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "GoodCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "RequestBasedSliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric"
+                }
+            },
+            "required": [
+                "RequestBasedSliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "MonitoredRequestCountMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "TotalRequestCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
                     },
                     "type": "array"
                 }
             },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                }
+            },
             "required": [
-                "CapacityAssignments"
+                "Duration",
+                "DurationUnit"
             ],
             "type": "object"
         },
-        "AWS::Athena::DataCatalog": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.Sli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "SliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.SliMetric"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricThreshold",
+                "SliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.SliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "PeriodSeconds": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation": {
+            "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": {
+                        "CapacityAssignmentConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetDpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetDpus"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkgroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WorkgroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityAssignments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CapacityAssignments"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -19179,6 +20090,12 @@
                 "MetricName": {
                     "type": "string"
                 },
+                "Metrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery"
+                    },
+                    "type": "array"
+                },
                 "Namespace": {
                     "type": "string"
                 },
@@ -19189,11 +20106,6 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "MetricName",
-                "Namespace",
-                "Statistic"
-            ],
             "type": "object"
         },
         "AWS::AutoScaling::ScalingPolicy.Metric": {
@@ -19478,179 +20390,222 @@
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::ScheduledAction": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Id": {
                     "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "DesiredCapacity": {
-                            "type": "number"
-                        },
-                        "EndTime": {
-                            "type": "string"
-                        },
-                        "MaxSize": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "Recurrence": {
-                            "type": "string"
-                        },
-                        "StartTime": {
-                            "type": "string"
-                        },
-                        "TimeZone": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::ScheduledAction"
-                    ],
+                "Label": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat": {
             "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "InstanceReusePolicy": {
-                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
-                        },
-                        "MaxGroupPreparedCapacity": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "PoolState": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
+                "Metric": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.Metric"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::WarmPool"
-                    ],
+                "Stat": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Metric",
+                "Stat"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "ReuseOnScaleIn": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::AutoScalingPlans::ScalingPlan": {
+        "AWS::AutoScaling::ScheduledAction": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "number"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Recurrence": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "InstanceReusePolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
+                        },
+                        "MaxGroupPreparedCapacity": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "PoolState": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::WarmPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ReuseOnScaleIn": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20048,6 +21003,9 @@
         "AWS::B2BI::Capability.EdiConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CapabilityDirection": {
+                    "type": "string"
+                },
                 "InputLocation": {
                     "$ref": "#/definitions/AWS::B2BI::Capability.S3Location"
                 },
@@ -20146,6 +21104,9 @@
                             },
                             "type": "array"
                         },
+                        "CapabilityOptions": {
+                            "$ref": "#/definitions/AWS::B2BI::Partnership.CapabilityOptions"
+                        },
                         "Email": {
                             "type": "string"
                         },
@@ -20166,6 +21127,7 @@
                         }
                     },
                     "required": [
+                        "Capabilities",
                         "Email",
                         "Name",
                         "ProfileId"
@@ -20193,93 +21155,112 @@
             ],
             "type": "object"
         },
-        "AWS::B2BI::Profile": {
+        "AWS::B2BI::Partnership.CapabilityOptions": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "OutboundEdi": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.OutboundEdiOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.OutboundEdiOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "X12": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Envelope"
+                }
+            },
+            "required": [
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Delimiters": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentSeparator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DataElementSeparator": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "SegmentTerminator": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Envelope": {
+            "additionalProperties": false,
+            "properties": {
+                "Common": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12OutboundEdiHeaders"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12FunctionalGroupHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationReceiverCode": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "ApplicationSenderCode": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "BusinessName": {
-                            "type": "string"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "Logging": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Phone": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "BusinessName",
-                        "Logging",
-                        "Name",
-                        "Phone"
-                    ],
-                    "type": "object"
+                "ResponsibleAgencyCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12InterchangeControlHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "AcknowledgmentRequestedCode": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::B2BI::Profile"
-                    ],
+                "ReceiverId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ReceiverIdQualifier": {
+                    "type": "string"
+                },
+                "RepetitionSeparator": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "SenderIdQualifier": {
+                    "type": "string"
+                },
+                "UsageIndicatorCode": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer": {
+        "AWS::B2BI::Partnership.X12OutboundEdiHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiters": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Delimiters"
+                },
+                "FunctionalGroupHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12FunctionalGroupHeaders"
+                },
+                "InterchangeControlHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12InterchangeControlHeaders"
+                },
+                "ValidateEdi": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Profile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20314,21 +21295,107 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EdiType": {
-                            "$ref": "#/definitions/AWS::B2BI::Transformer.EdiType"
+                        "BusinessName": {
+                            "type": "string"
                         },
-                        "FileFormat": {
+                        "Email": {
                             "type": "string"
                         },
-                        "MappingTemplate": {
+                        "Logging": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "SampleDocument": {
+                        "Phone": {
                             "type": "string"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BusinessName",
+                        "Logging",
+                        "Name",
+                        "Phone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::B2BI::Profile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer": {
+            "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": {
+                        "InputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.InputConversion"
+                        },
+                        "Mapping": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.Mapping"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.OutputConversion"
+                        },
+                        "SampleDocuments": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocuments"
+                        },
                         "Status": {
                             "type": "string"
                         },
@@ -20340,9 +21407,6 @@
                         }
                     },
                     "required": [
-                        "EdiType",
-                        "FileFormat",
-                        "MappingTemplate",
                         "Name",
                         "Status"
                     ],
@@ -20369,15 +21433,91 @@
             ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer.EdiType": {
+        "AWS::B2BI::Transformer.FormatOptions": {
             "additionalProperties": false,
             "properties": {
-                "X12Details": {
+                "X12": {
                     "$ref": "#/definitions/AWS::B2BI::Transformer.X12Details"
                 }
             },
             "required": [
-                "X12Details"
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.InputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "FromFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FromFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.Mapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Template": {
+                    "type": "string"
+                },
+                "TemplateLanguage": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateLanguage"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.OutputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "ToFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ToFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocumentKeys": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Output": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Keys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocumentKeys"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Keys"
             ],
             "type": "object"
         },
@@ -21408,6 +22548,9 @@
                         "ScheduleExpressionTimezone": {
                             "type": "string"
                         },
+                        "ScheduleStatus": {
+                            "type": "string"
+                        },
                         "StartWindowHours": {
                             "type": "number"
                         },
@@ -21736,6 +22879,9 @@
                         "ComputeResources": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
                         },
+                        "Context": {
+                            "type": "string"
+                        },
                         "EksConfiguration": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.EksConfiguration"
                         },
@@ -22613,6 +23759,9 @@
                 "EcsProperties": {
                     "$ref": "#/definitions/AWS::Batch::JobDefinition.EcsProperties"
                 },
+                "EksProperties": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EksProperties"
+                },
                 "InstanceTypes": {
                     "items": {
                         "type": "string"
@@ -23207,6 +24356,9 @@
                         "FoundationModel": {
                             "type": "string"
                         },
+                        "GuardrailConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.GuardrailConfiguration"
+                        },
                         "IdleSessionTTLInSeconds": {
                             "type": "number"
                         },
@@ -23285,13 +24437,13 @@
         "AWS::Bedrock::Agent.ActionGroupExecutor": {
             "additionalProperties": false,
             "properties": {
+                "CustomControl": {
+                    "type": "string"
+                },
                 "Lambda": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Lambda"
-            ],
             "type": "object"
         },
         "AWS::Bedrock::Agent.AgentActionGroup": {
@@ -23312,6 +24464,9 @@
                 "Description": {
                     "type": "string"
                 },
+                "FunctionSchema": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.FunctionSchema"
+                },
                 "ParentActionGroupSignature": {
                     "type": "string"
                 },
@@ -23343,367 +24498,154 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.InferenceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumLength": {
-                    "type": "number"
-                },
-                "StopSequences": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Temperature": {
-                    "type": "number"
-                },
-                "TopK": {
-                    "type": "number"
-                },
-                "TopP": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Agent.PromptConfiguration": {
+        "AWS::Bedrock::Agent.Function": {
             "additionalProperties": false,
             "properties": {
-                "BasePromptTemplate": {
-                    "type": "string"
-                },
-                "InferenceConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
-                },
-                "ParserMode": {
-                    "type": "string"
-                },
-                "PromptCreationMode": {
+                "Description": {
                     "type": "string"
                 },
-                "PromptState": {
+                "Name": {
                     "type": "string"
                 },
-                "PromptType": {
-                    "type": "string"
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.ParameterDetail"
+                        }
+                    },
+                    "type": "object"
                 }
             },
+            "required": [
+                "Name"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
+        "AWS::Bedrock::Agent.FunctionSchema": {
             "additionalProperties": false,
             "properties": {
-                "OverrideLambda": {
-                    "type": "string"
-                },
-                "PromptConfigurations": {
+                "Functions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.Function"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PromptConfigurations"
+                "Functions"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.S3Identifier": {
+        "AWS::Bedrock::Agent.GuardrailConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "S3BucketName": {
+                "GuardrailIdentifier": {
                     "type": "string"
                 },
-                "S3ObjectKey": {
+                "GuardrailVersion": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias": {
+        "AWS::Bedrock::Agent.InferenceConfiguration": {
             "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"
+                "MaximumLength": {
+                    "type": "number"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "AgentAliasName": {
-                            "type": "string"
-                        },
-                        "AgentId": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "RoutingConfiguration": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "AgentAliasName",
-                        "AgentId"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::AgentAlias"
-                    ],
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+        "AWS::Bedrock::Agent.ParameterDetail": {
             "additionalProperties": false,
             "properties": {
-                "EndDate": {
+                "Description": {
                     "type": "string"
                 },
-                "RoutingConfiguration": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                    },
-                    "type": "array"
+                "Required": {
+                    "type": "boolean"
                 },
-                "StartDate": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
-            "additionalProperties": false,
-            "properties": {
-                "AgentVersion": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "AgentVersion"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource": {
+        "AWS::Bedrock::Agent.PromptConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "BasePromptTemplate": {
                     "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": {
-                        "DataSourceConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "KnowledgeBaseId": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ServerSideEncryptionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
-                        },
-                        "VectorIngestionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
-                        }
-                    },
-                    "required": [
-                        "DataSourceConfiguration",
-                        "KnowledgeBaseId",
-                        "Name"
-                    ],
-                    "type": "object"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::DataSource"
-                    ],
+                "ParserMode": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingStrategy": {
+                "PromptCreationMode": {
                     "type": "string"
                 },
-                "FixedSizeChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
-                }
-            },
-            "required": [
-                "ChunkingStrategy"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3Configuration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
-                },
-                "Type": {
+                "PromptState": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "S3Configuration",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxTokens": {
-                    "type": "number"
                 },
-                "OverlapPercentage": {
-                    "type": "number"
+                "PromptType": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "MaxTokens",
-                "OverlapPercentage"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BucketArn": {
+                "OverrideLambda": {
                     "type": "string"
                 },
-                "InclusionPrefixes": {
+                "PromptConfigurations": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "BucketArn"
+                "PromptConfigurations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+        "AWS::Bedrock::Agent.S3Identifier": {
             "additionalProperties": false,
             "properties": {
-                "KmsKeyArn": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectKey": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Guardrail": {
+        "AWS::Bedrock::AgentAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -23738,50 +24680,155 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BlockedInputMessaging": {
+                        "AgentAliasName": {
                             "type": "string"
                         },
-                        "BlockedOutputsMessaging": {
+                        "AgentId": {
                             "type": "string"
                         },
-                        "ContentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
-                            "type": "string"
+                        "RoutingConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                            },
+                            "type": "array"
                         },
-                        "Name": {
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AgentAliasName",
+                        "AgentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Bedrock::AgentAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EndDate": {
+                    "type": "string"
+                },
+                "RoutingConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                    },
+                    "type": "array"
+                },
+                "StartDate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SensitiveInformationPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
-                        },
-                        "Tags": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDeletionPolicy": {
+                            "type": "string"
                         },
-                        "TopicPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
                         },
-                        "WordPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KnowledgeBaseId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
+                        },
+                        "VectorIngestionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
                         }
                     },
                     "required": [
-                        "BlockedInputMessaging",
-                        "BlockedOutputsMessaging",
+                        "DataSourceConfiguration",
+                        "KnowledgeBaseId",
                         "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::Guardrail"
+                        "AWS::Bedrock::DataSource"
                     ],
                     "type": "string"
                 },
@@ -23800,46 +24847,144 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
+        "AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "InputStrength": {
+                "ModelArn": {
                     "type": "string"
                 },
-                "OutputStrength": {
+                "ParsingPrompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingPrompt"
+                }
+            },
+            "required": [
+                "ModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingStrategy": {
+                    "type": "string"
+                },
+                "FixedSizeChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
+                },
+                "HierarchicalChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration"
+                },
+                "SemanticChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SemanticChunkingConfiguration"
+                }
+            },
+            "required": [
+                "ChunkingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
+                "HostType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostType",
+                "HostUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.CrawlFilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PatternObjectFilter": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilterConfiguration"
+                },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InputStrength",
-                "OutputStrength",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
+        "AWS::Bedrock::DataSource.CustomTransformationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FiltersConfig": {
+                "IntermediateStorage": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.IntermediateStorage"
+                },
+                "Transformations": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.Transformation"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "FiltersConfig"
+                "IntermediateStorage",
+                "Transformations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointDataSourceConfiguration"
+                },
                 "Type": {
                     "type": "string"
+                },
+                "WebConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebDataSourceConfiguration"
                 }
             },
             "required": [
@@ -23847,135 +24992,438 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "Type": {
-                    "type": "string"
+                "OverlapPercentage": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Action",
-                "Type"
+                "MaxTokens",
+                "OverlapPercentage"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.RegexConfig": {
+        "AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "LevelConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration"
+                    },
+                    "type": "array"
                 },
-                "Description": {
-                    "type": "string"
+                "OverlapTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LevelConfigurations",
+                "OverlapTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.IntermediateStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockFoundationModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration"
                 },
-                "Name": {
+                "ParsingStrategy": {
                     "type": "string"
-                },
-                "Pattern": {
+                }
+            },
+            "required": [
+                "ParsingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingPrompt": {
+            "additionalProperties": false,
+            "properties": {
+                "ParsingPromptText": {
                     "type": "string"
                 }
             },
             "required": [
-                "Action",
-                "Name",
-                "Pattern"
+                "ParsingPromptText"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilter": {
             "additionalProperties": false,
             "properties": {
-                "PiiEntitiesConfig": {
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "RegexesConfig": {
+                "InclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "ObjectType": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ObjectType"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilterConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Definition": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Filters"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
                     "type": "string"
                 },
-                "Examples": {
+                "BucketOwnerAccountId": {
+                    "type": "string"
+                },
+                "InclusionPrefixes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "BucketArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "URI"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration"
                 },
-                "Name": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
                     "type": "string"
                 },
-                "Type": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "HostUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Definition",
-                "Name",
-                "Type"
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostUrl"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
+        "AWS::Bedrock::DataSource.SeedUrl": {
             "additionalProperties": false,
             "properties": {
-                "TopicsConfig": {
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SemanticChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BreakpointPercentileThreshold": {
+                    "type": "number"
+                },
+                "BufferSize": {
+                    "type": "number"
+                },
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BreakpointPercentileThreshold",
+                "BufferSize",
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                },
+                "HostType": {
+                    "type": "string"
+                },
+                "SiteUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "TenantId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TopicsConfig"
+                "AuthType",
+                "CredentialsSecretArn",
+                "Domain",
+                "HostType",
+                "SiteUrls"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordConfig": {
+        "AWS::Bedrock::DataSource.Transformation": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
+                "StepToApply": {
                     "type": "string"
+                },
+                "TransformationFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationFunction"
                 }
             },
             "required": [
-                "Text"
+                "StepToApply",
+                "TransformationFunction"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+        "AWS::Bedrock::DataSource.TransformationFunction": {
             "additionalProperties": false,
             "properties": {
-                "ManagedWordListsConfig": {
+                "TransformationLambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationLambdaConfiguration"
+                }
+            },
+            "required": [
+                "TransformationLambdaConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.TransformationLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.UrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.SeedUrl"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
                 },
-                "WordsConfig": {
+                "CustomTransformationConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CustomTransformationConfiguration"
+                },
+                "ParsingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerLimits": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerLimits"
+                },
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionFilters": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "Scope": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase": {
+        "AWS::Bedrock::DataSource.WebCrawlerLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "UrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.UrlConfiguration"
+                }
+            },
+            "required": [
+                "UrlConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24010,20 +25458,35 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "KnowledgeBaseConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDefinition"
                         },
-                        "Name": {
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.S3Location"
+                        },
+                        "DefinitionString": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StorageConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
                         },
                         "Tags": {
                             "additionalProperties": true,
@@ -24033,19 +25496,26 @@
                                 }
                             },
                             "type": "object"
+                        },
+                        "TestAliasTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "KnowledgeBaseConfiguration",
-                        "Name",
-                        "RoleArn",
-                        "StorageConfiguration"
+                        "ExecutionRoleArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::KnowledgeBase"
+                        "AWS::Bedrock::Flow"
                     ],
                     "type": "string"
                 },
@@ -24064,187 +25534,517 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "AgentAliasArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.ConditionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
                     "type": "string"
                 },
-                "VectorKnowledgeBaseConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                "Name": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "VectorKnowledgeBaseConfiguration"
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+        "AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CollectionArn": {
+                "Condition": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnectionConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                "Name": {
+                    "type": "string"
                 },
-                "VectorIndexName": {
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "CollectionArn",
-                "FieldMapping",
-                "VectorIndexName"
+                "Name",
+                "Source",
+                "Target",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+        "AWS::Bedrock::Flow.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
-                    "type": "string"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration"
                 },
-                "TextField": {
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
                     "type": "string"
                 },
-                "VectorField": {
+                "TargetInput": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField",
-                "VectorField"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+        "AWS::Bedrock::Flow.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionString": {
+                "Connections": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnection"
+                    },
+                    "type": "array"
+                },
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNode"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeConfiguration"
+                },
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "CredentialsSecretArn": {
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeOutput"
+                    },
+                    "type": "array"
+                },
+                "Type": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.AgentFlowNodeConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                "Collector": {
+                    "type": "object"
                 },
-                "Namespace": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.ConditionFlowNodeConfiguration"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Iterator": {
+                    "type": "object"
+                },
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration"
+                },
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "ConnectionString",
-                "CredentialsSecretArn",
-                "FieldMapping"
+                "Expression",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+        "AWS::Bedrock::Flow.FlowNodeOutput": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "Name": {
                     "type": "string"
                 },
-                "TextField": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+        "AWS::Bedrock::Flow.FlowValidation": {
             "additionalProperties": false,
             "properties": {
-                "CredentialsSecretArn": {
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
                     "type": "string"
                 },
-                "DatabaseName": {
+                "ModelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LexFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                "LocaleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BotAliasArn",
+                "LocaleId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInferenceConfiguration"
                 },
-                "ResourceArn": {
+                "ModelId": {
                     "type": "string"
                 },
-                "TableName": {
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "CredentialsSecretArn",
-                "DatabaseName",
-                "FieldMapping",
-                "ResourceArn",
-                "TableName"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+        "AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "PromptArn": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration"
                 },
-                "PrimaryKeyField": {
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "TextField": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "VectorField": {
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "PrimaryKeyField",
-                "TextField",
-                "VectorField"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+        "AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "OpensearchServerlessConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
-                },
-                "PineconeConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
                 },
-                "RdsConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "Type": {
+                "Version": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.StorageFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "EmbeddingModelArn": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.StorageFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "EmbeddingModelArn"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup": {
+        "AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24279,39 +26079,41 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountGrouping": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
-                        },
-                        "ComputationPreference": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
                         },
-                        "PrimaryAccountId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "RoutingConfiguration": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "AccountGrouping",
-                        "ComputationPreference",
+                        "FlowArn",
                         "Name",
-                        "PrimaryAccountId"
+                        "RoutingConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::BillingGroup"
+                        "AWS::Bedrock::FlowAlias"
                     ],
                     "type": "string"
                 },
@@ -24330,37 +26132,16 @@
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoAssociate": {
-                    "type": "boolean"
-                },
-                "LinkedAccountIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "LinkedAccountIds"
-            ],
-            "type": "object"
-        },
-        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+        "AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem": {
             "additionalProperties": false,
             "properties": {
-                "PricingPlanArn": {
+                "FlowVersion": {
                     "type": "string"
                 }
             },
-            "required": [
-                "PricingPlanArn"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem": {
+        "AWS::Bedrock::FlowVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24395,40 +26176,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountId": {
-                            "type": "string"
-                        },
-                        "BillingGroupArn": {
-                            "type": "string"
-                        },
-                        "BillingPeriodRange": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
-                        },
-                        "CustomLineItemChargeDetails": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
                     "required": [
-                        "BillingGroupArn",
-                        "Name"
+                        "FlowArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::CustomLineItem"
+                        "AWS::Bedrock::FlowVersion"
                     ],
                     "type": "string"
                 },
@@ -24447,557 +26209,486 @@
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+        "AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ExclusiveEndBillingPeriod": {
-                    "type": "string"
-                },
-                "InclusiveStartBillingPeriod": {
+                "AgentAliasArn": {
                     "type": "string"
                 }
             },
-            "type": "object"
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+        "AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Flat": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
-                },
-                "LineItemFilters": {
+                "Conditions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowCondition"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
                 },
-                "Percentage": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnectionConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
                 },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
+                "Name",
+                "Source",
+                "Target",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ChargeValue": {
-                    "type": "number"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration"
+                },
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
+                    "type": "string"
+                },
+                "TargetInput": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ChargeValue"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ChildAssociatedResources": {
+                "Connections": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnection"
                     },
                     "type": "array"
                 },
-                "PercentageValue": {
-                    "type": "number"
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNode"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "PercentageValue"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+        "AWS::Bedrock::FlowVersion.FlowNode": {
             "additionalProperties": false,
             "properties": {
-                "Attribute": {
-                    "type": "string"
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeConfiguration"
                 },
-                "MatchOption": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Values": {
+                "Outputs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeOutput"
                     },
                     "type": "array"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Attribute",
-                "MatchOption",
-                "Values"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingPlan": {
+        "AWS::Bedrock::FlowVersion.FlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Collector": {
+                    "type": "object"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration"
                 },
-                "Metadata": {
+                "Input": {
                     "type": "object"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "PricingRuleArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name"
-                    ],
+                "Iterator": {
                     "type": "object"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingPlan"
-                    ],
-                    "type": "string"
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule": {
+        "AWS::Bedrock::FlowVersion.FlowNodeInput": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Name": {
                     "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": {
-                        "BillingEntity": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ModifierPercentage": {
-                            "type": "number"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Operation": {
-                            "type": "string"
-                        },
-                        "Scope": {
-                            "type": "string"
-                        },
-                        "Service": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Tiering": {
-                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "UsageType": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "Scope",
-                        "Type"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingRule"
-                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowNodeOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.FreeTier": {
+        "AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Activated": {
-                    "type": "boolean"
+                "KnowledgeBaseId": {
+                    "type": "string"
+                },
+                "ModelId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Activated"
+                "KnowledgeBaseId"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.Tiering": {
+        "AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FreeTier": {
-                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
+                "LambdaArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "LambdaArn"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::Budget": {
+        "AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration": {
             "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": {
-                        "Budget": {
-                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
-                        },
-                        "NotificationsWithSubscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Budget"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Budgets::Budget"
-                    ],
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "LocaleId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "BotAliasArn",
+                "LocaleId"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.AutoAdjustData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustType": {
-                    "type": "string"
-                },
-                "HistoricalOptions": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration"
                 }
             },
             "required": [
-                "AutoAdjustType"
+                "SourceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.BudgetData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustData": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
-                },
-                "BudgetLimit": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
-                },
-                "BudgetName": {
-                    "type": "string"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInferenceConfiguration"
                 },
-                "BudgetType": {
+                "ModelId": {
                     "type": "string"
                 },
-                "CostFilters": {
-                    "type": "object"
-                },
-                "CostTypes": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
-                },
-                "PlannedBudgetLimits": {
-                    "type": "object"
-                },
-                "TimePeriod": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptTemplateConfiguration"
                 },
-                "TimeUnit": {
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "BudgetType",
-                "TimeUnit"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.CostTypes": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "IncludeCredit": {
-                    "type": "boolean"
-                },
-                "IncludeDiscount": {
-                    "type": "boolean"
-                },
-                "IncludeOtherSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeRecurring": {
-                    "type": "boolean"
-                },
-                "IncludeRefund": {
-                    "type": "boolean"
-                },
-                "IncludeSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeSupport": {
-                    "type": "boolean"
-                },
-                "IncludeTax": {
-                    "type": "boolean"
-                },
-                "IncludeUpfront": {
-                    "type": "boolean"
-                },
-                "UseAmortized": {
-                    "type": "boolean"
+                "PromptArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration"
                 },
-                "UseBlended": {
-                    "type": "boolean"
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration"
                 }
             },
             "type": "object"
         },
-        "AWS::Budgets::Budget.HistoricalOptions": {
+        "AWS::Bedrock::FlowVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BudgetAdjustmentPeriod": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "BudgetAdjustmentPeriod"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Notification": {
+        "AWS::Bedrock::FlowVersion.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "ComparisonOperator": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "NotificationType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Threshold": {
+                "Temperature": {
                     "type": "number"
                 },
-                "ThresholdType": {
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ComparisonOperator",
-                "NotificationType",
-                "Threshold"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Notification": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
-                },
-                "Subscribers": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
-                    },
-                    "type": "array"
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Notification",
-                "Subscribers"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Spend": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Amount": {
-                    "type": "number"
-                },
-                "Unit": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Amount",
-                "Unit"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Subscriber": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "SubscriptionType": {
-                    "type": "string"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Address",
-                "SubscriptionType"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.TimePeriod": {
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "End": {
+                "BucketName": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInputVariable"
+                    },
+                    "type": "array"
                 },
-                "Start": {
+                "Text": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Text"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction": {
+        "AWS::Bedrock::Guardrail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25032,48 +26723,53 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionThreshold": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
-                        },
-                        "ActionType": {
+                        "BlockedInputMessaging": {
                             "type": "string"
                         },
-                        "ApprovalModel": {
+                        "BlockedOutputsMessaging": {
                             "type": "string"
                         },
-                        "BudgetName": {
-                            "type": "string"
+                        "ContentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
                         },
-                        "Definition": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        "ContextualGroundingPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig"
                         },
-                        "ExecutionRoleArn": {
+                        "Description": {
                             "type": "string"
                         },
-                        "NotificationType": {
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Subscribers": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SensitiveInformationPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
+                        },
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TopicPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        },
+                        "WordPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
                         }
                     },
                     "required": [
-                        "ActionThreshold",
-                        "ActionType",
-                        "BudgetName",
-                        "Definition",
-                        "ExecutionRoleArn",
-                        "NotificationType",
-                        "Subscribers"
+                        "BlockedInputMessaging",
+                        "BlockedOutputsMessaging",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Budgets::BudgetsAction"
+                        "AWS::Bedrock::Guardrail"
                     ],
                     "type": "string"
                 },
@@ -25092,126 +26788,213 @@
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "InputStrength": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "number"
+                "OutputStrength": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Value"
+                "InputStrength",
+                "OutputStrength",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Definition": {
+        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "IamActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
-                },
-                "ScpActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                "FiltersConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FiltersConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Threshold": {
+                    "type": "number"
                 },
-                "SsmActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "Threshold",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Groups": {
+                "FiltersConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "FiltersConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
                 },
-                "PolicyArn": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.RegexConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
                     "type": "string"
                 },
-                "Roles": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PiiEntitiesConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
                     },
                     "type": "array"
                 },
-                "Users": {
+                "RegexesConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
                     },
                     "type": "array"
                 }
             },
-            "required": [
-                "PolicyArn"
-            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+        "AWS::Bedrock::Guardrail.TopicConfig": {
             "additionalProperties": false,
             "properties": {
-                "PolicyId": {
+                "Definition": {
                     "type": "string"
                 },
-                "TargetIds": {
+                "Examples": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "PolicyId",
-                "TargetIds"
+                "Definition",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceIds": {
+                "TopicsConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
                     },
                     "type": "array"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "Subtype": {
-                    "type": "string"
                 }
             },
             "required": [
-                "InstanceIds",
-                "Region",
-                "Subtype"
+                "TopicsConfig"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Subscriber": {
+        "AWS::Bedrock::Guardrail.WordConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "Type": {
+                "Text": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::CDK::Metadata": {
+        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ManagedWordListsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                    },
+                    "type": "array"
+                },
+                "WordsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::GuardrailVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25246,15 +27029,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Analytics": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GuardrailIdentifier": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "GuardrailIdentifier"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CDK::Metadata"
+                        "AWS::Bedrock::GuardrailVersion"
                     ],
                     "type": "string"
                 },
@@ -25268,11 +27057,12 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor": {
+        "AWS::Bedrock::KnowledgeBase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25307,34 +27097,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MonitorDimension": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MonitorName": {
-                            "type": "string"
+                        "KnowledgeBaseConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
                         },
-                        "MonitorSpecification": {
+                        "Name": {
                             "type": "string"
                         },
-                        "MonitorType": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
+                        "StorageConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
                             },
-                            "type": "array"
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MonitorName",
-                        "MonitorType"
+                        "KnowledgeBaseConfiguration",
+                        "Name",
+                        "RoleArn",
+                        "StorageConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CE::AnomalyMonitor"
+                        "AWS::Bedrock::KnowledgeBase"
                     ],
                     "type": "string"
                 },
@@ -25353,405 +27151,242 @@
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor.ResourceTag": {
+        "AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "Dimensions": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockEmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "string"
+                "VectorKnowledgeBaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "Type",
+                "VectorKnowledgeBaseConfiguration"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription": {
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "CollectionName": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "Endpoint": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Frequency": {
-                            "type": "string"
-                        },
-                        "MonitorArnList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
-                            },
-                            "type": "array"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
-                            },
-                            "type": "array"
-                        },
-                        "SubscriptionName": {
-                            "type": "string"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdExpression": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Frequency",
-                        "MonitorArnList",
-                        "Subscribers",
-                        "SubscriptionName"
-                    ],
-                    "type": "object"
+                "EndpointServiceName": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalySubscription"
-                    ],
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping"
+                },
+                "VectorIndexName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionName",
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "Endpoint",
+                "FieldMapping",
+                "VectorIndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "MetadataField",
+                "TextField",
+                "VectorField"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.ResourceTag": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CollectionArn": {
                     "type": "string"
                 },
-                "Value": {
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                },
+                "VectorIndexName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "CollectionArn",
+                "FieldMapping",
+                "VectorIndexName"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.Subscriber": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "Status": {
+                "TextField": {
                     "type": "string"
                 },
-                "Type": {
+                "VectorField": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "MetadataField",
+                "TextField",
+                "VectorField"
             ],
             "type": "object"
         },
-        "AWS::CE::CostCategory": {
+        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ConnectionString": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DefaultValue": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RuleVersion": {
-                            "type": "string"
-                        },
-                        "Rules": {
-                            "type": "string"
-                        },
-                        "SplitChargeRules": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "RuleVersion",
-                        "Rules"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::CostCategory"
-                    ],
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectionString",
+                "CredentialsSecretArn",
+                "FieldMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "TextField": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "MetadataField",
+                "TextField"
             ],
             "type": "object"
         },
-        "AWS::CUR::ReportDefinition": {
+        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DatabaseName": {
                     "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": {
-                        "AdditionalArtifacts": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AdditionalSchemaElements": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BillingViewArn": {
-                            "type": "string"
-                        },
-                        "Compression": {
-                            "type": "string"
-                        },
-                        "Format": {
-                            "type": "string"
-                        },
-                        "RefreshClosedReports": {
-                            "type": "boolean"
-                        },
-                        "ReportName": {
-                            "type": "string"
-                        },
-                        "ReportVersioning": {
-                            "type": "string"
-                        },
-                        "S3Bucket": {
-                            "type": "string"
-                        },
-                        "S3Prefix": {
-                            "type": "string"
-                        },
-                        "S3Region": {
-                            "type": "string"
-                        },
-                        "TimeUnit": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Compression",
-                        "Format",
-                        "RefreshClosedReports",
-                        "ReportName",
-                        "ReportVersioning",
-                        "S3Bucket",
-                        "S3Prefix",
-                        "S3Region",
-                        "TimeUnit"
-                    ],
-                    "type": "object"
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CUR::ReportDefinition"
-                    ],
+                "ResourceArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "TableName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "FieldMapping",
+                "ResourceArn",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace": {
+        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "MetadataField": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "PrimaryKeyField": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "TextField": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "PrimaryKeyField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MongoDbAtlasConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "KeyspaceName": {
-                            "type": "string"
-                        },
-                        "ReplicationSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "type": "object"
+                "OpensearchServerlessConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Cassandra::Keyspace"
-                    ],
-                    "type": "string"
+                "PineconeConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "RdsConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
@@ -25760,22 +27395,22 @@
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
+        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "RegionList": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "ReplicationStrategy": {
+                "EmbeddingModelArn": {
                     "type": "string"
+                },
+                "EmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration"
                 }
             },
+            "required": [
+                "EmbeddingModelArn"
+            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table": {
+        "AWS::Bedrock::Prompt": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25810,70 +27445,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoScalingSpecifications": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
-                        },
-                        "BillingMode": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
-                        },
-                        "ClientSideTimestampsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ClusteringKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
-                            },
-                            "type": "array"
-                        },
-                        "DefaultTimeToLive": {
-                            "type": "number"
-                        },
-                        "EncryptionSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
-                        },
-                        "KeyspaceName": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "PartitionKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
-                        },
-                        "PointInTimeRecoveryEnabled": {
-                            "type": "boolean"
-                        },
-                        "RegularColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
+                        "DefaultVariant": {
+                            "type": "string"
                         },
-                        "ReplicaSpecifications": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
                         },
-                        "TableName": {
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptVariant"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "KeyspaceName",
-                        "PartitionKeyColumns"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cassandra::Table"
+                        "AWS::Bedrock::Prompt"
                     ],
                     "type": "string"
                 },
@@ -25892,162 +27499,126 @@
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.AutoScalingSetting": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoScalingDisabled": {
-                    "type": "boolean"
-                },
-                "MaximumUnits": {
-                    "type": "number"
-                },
-                "MinimumUnits": {
-                    "type": "number"
-                },
-                "ScalingPolicy": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.AutoScalingSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                },
-                "WriteCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.BillingMode": {
+        "AWS::Bedrock::Prompt.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Mode": {
-                    "type": "string"
-                },
-                "ProvisionedThroughput": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "Mode"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+        "AWS::Bedrock::Prompt.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "Column": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                },
-                "OrderBy": {
+                "Name": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Column"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.Column": {
+        "AWS::Bedrock::Prompt.PromptModelInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "ColumnType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnType"
-            ],
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.EncryptionSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "EncryptionType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "KmsKeyIdentifier": {
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "EncryptionType"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ProvisionedThroughput": {
+        "AWS::Bedrock::Prompt.PromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityUnits": {
-                    "type": "number"
-                },
-                "WriteCapacityUnits": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ReadCapacityUnits",
-                "WriteCapacityUnits"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ReplicaSpecification": {
+        "AWS::Bedrock::Prompt.PromptVariant": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInferenceConfiguration"
                 },
-                "ReadCapacityUnits": {
-                    "type": "number"
+                "ModelId": {
+                    "type": "string"
                 },
-                "Region": {
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Region"
+                "Name",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ScalingPolicy": {
+        "AWS::Bedrock::Prompt.TextPromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "TargetTrackingScalingPolicyConfiguration": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextS3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextS3Location"
                 }
             },
             "type": "object"
         },
-        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+        "AWS::Bedrock::Prompt.TextS3Location": {
             "additionalProperties": false,
             "properties": {
-                "DisableScaleIn": {
-                    "type": "boolean"
-                },
-                "ScaleInCooldown": {
-                    "type": "number"
+                "Bucket": {
+                    "type": "string"
                 },
-                "ScaleOutCooldown": {
-                    "type": "number"
+                "Key": {
+                    "type": "string"
                 },
-                "TargetValue": {
-                    "type": "number"
+                "Version": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TargetValue"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account": {
+        "AWS::Bedrock::PromptVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26082,18 +27653,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExpiryEventsConfiguration": {
-                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PromptArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "ExpiryEventsConfiguration"
+                        "PromptArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Account"
+                        "AWS::Bedrock::PromptVersion"
                     ],
                     "type": "string"
                 },
@@ -26112,16 +27695,107 @@
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+        "AWS::Bedrock::PromptVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "DaysBeforeExpiry": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                },
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
                     "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate": {
+        "AWS::Bedrock::PromptVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInferenceConfiguration"
+                },
+                "ModelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "TemplateType"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26156,48 +27830,39 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CertificateAuthorityArn": {
-                            "type": "string"
+                        "AccountGrouping": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
                         },
-                        "CertificateTransparencyLoggingPreference": {
-                            "type": "string"
+                        "ComputationPreference": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
                         },
-                        "DomainName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "DomainValidationOptions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
-                            },
-                            "type": "array"
-                        },
-                        "KeyAlgorithm": {
+                        "Name": {
                             "type": "string"
                         },
-                        "SubjectAlternativeNames": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "PrimaryAccountId": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ValidationMethod": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "AccountGrouping",
+                        "ComputationPreference",
+                        "Name",
+                        "PrimaryAccountId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Certificate"
+                        "AWS::BillingConductor::BillingGroup"
                     ],
                     "type": "string"
                 },
@@ -26216,25 +27881,37 @@
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "HostedZoneId": {
-                    "type": "string"
+                "AutoAssociate": {
+                    "type": "boolean"
                 },
-                "ValidationDomain": {
+                "LinkedAccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LinkedAccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "PricingPlanArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "DomainName"
+                "PricingPlanArn"
             ],
             "type": "object"
         },
-        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26269,52 +27946,40 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
-                            "type": "string"
-                        },
-                        "GuardrailPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "IamRoleArn": {
+                        "AccountId": {
                             "type": "string"
                         },
-                        "LoggingLevel": {
+                        "BillingGroupArn": {
                             "type": "string"
                         },
-                        "SnsTopicArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "BillingPeriodRange": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
                         },
-                        "TeamId": {
-                            "type": "string"
+                        "CustomLineItemChargeDetails": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
                         },
-                        "TeamsChannelId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TeamsTenantId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "UserRoleRequired": {
-                            "type": "boolean"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "TeamId",
-                        "TeamsChannelId",
-                        "TeamsTenantId"
+                        "BillingGroupArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
+                        "AWS::BillingConductor::CustomLineItem"
                     ],
                     "type": "string"
                 },
@@ -26333,7 +27998,96 @@
             ],
             "type": "object"
         },
-        "AWS::Chatbot::SlackChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+            "additionalProperties": false,
+            "properties": {
+                "ExclusiveEndBillingPeriod": {
+                    "type": "string"
+                },
+                "InclusiveStartBillingPeriod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Flat": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
+                },
+                "LineItemFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                    },
+                    "type": "array"
+                },
+                "Percentage": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChargeValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChargeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssociatedResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PercentageValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "PercentageValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MatchOption": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attribute",
+                "MatchOption",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::PricingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26368,48 +28122,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "GuardrailPolicies": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PricingRuleArns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "IamRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingLevel": {
-                            "type": "string"
-                        },
-                        "SlackChannelId": {
-                            "type": "string"
-                        },
-                        "SlackWorkspaceId": {
-                            "type": "string"
-                        },
-                        "SnsTopicArns": {
+                        "Tags": {
                             "items": {
-                                "type": "string"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserRoleRequired": {
-                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "SlackChannelId",
-                        "SlackWorkspaceId"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::SlackChannelConfiguration"
+                        "AWS::BillingConductor::PricingPlan"
                     ],
                     "type": "string"
                 },
@@ -26428,7 +28167,7 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate": {
+        "AWS::BillingConductor::PricingRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26463,45 +28202,53 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AnalysisParameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
-                            },
-                            "type": "array"
+                        "BillingEntity": {
+                            "type": "string"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "Format": {
+                        "ModifierPercentage": {
+                            "type": "number"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Operation": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Scope": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        "Service": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Tiering": {
+                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UsageType": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "MembershipIdentifier",
                         "Name",
-                        "Source"
+                        "Scope",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::AnalysisTemplate"
+                        "AWS::BillingConductor::PricingRule"
                     ],
                     "type": "string"
                 },
@@ -26520,53 +28267,28 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
-            "additionalProperties": false,
-            "properties": {
-                "DefaultValue": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+        "AWS::BillingConductor::PricingRule.FreeTier": {
             "additionalProperties": false,
             "properties": {
-                "ReferencedTables": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Activated": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "ReferencedTables"
+                "Activated"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+        "AWS::BillingConductor::PricingRule.Tiering": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
-                    "type": "string"
+                "FreeTier": {
+                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
                 }
             },
-            "required": [
-                "Text"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration": {
+        "AWS::Budgets::Budget": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26601,56 +28323,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CreatorDisplayName": {
-                            "type": "string"
-                        },
-                        "CreatorMemberAbilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "CreatorPaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
-                        },
-                        "DataEncryptionMetadata": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
-                        },
-                        "Description": {
-                            "type": "string"
+                        "Budget": {
+                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
                         },
-                        "Members": {
+                        "NotificationsWithSubscribers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
                             },
                             "type": "array"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "CreatorDisplayName",
-                        "CreatorMemberAbilities",
-                        "Description",
-                        "Members",
-                        "Name",
-                        "QueryLogStatus"
+                        "Budget"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Collaboration"
+                        "AWS::Budgets::Budget"
                     ],
                     "type": "string"
                 },
@@ -26669,417 +28365,211 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+        "AWS::Budgets::Budget.AutoAdjustData": {
             "additionalProperties": false,
             "properties": {
-                "AllowCleartext": {
-                    "type": "boolean"
-                },
-                "AllowDuplicates": {
-                    "type": "boolean"
-                },
-                "AllowJoinsOnColumnsWithDifferentNames": {
-                    "type": "boolean"
+                "AutoAdjustType": {
+                    "type": "string"
                 },
-                "PreserveNulls": {
-                    "type": "boolean"
+                "HistoricalOptions": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
                 }
             },
             "required": [
-                "AllowCleartext",
-                "AllowDuplicates",
-                "AllowJoinsOnColumnsWithDifferentNames",
-                "PreserveNulls"
+                "AutoAdjustType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+        "AWS::Budgets::Budget.BudgetData": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "AutoAdjustData": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
+                },
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
                     "type": "string"
                 },
-                "DisplayName": {
+                "BudgetType": {
                     "type": "string"
                 },
-                "MemberAbilities": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "CostFilters": {
+                    "type": "object"
                 },
-                "PaymentConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AccountId",
-                "DisplayName",
-                "MemberAbilities"
+                "BudgetType",
+                "TimeUnit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+        "AWS::Budgets::Budget.CostTypes": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                "IncludeCredit": {
+                    "type": "boolean"
+                },
+                "IncludeDiscount": {
+                    "type": "boolean"
+                },
+                "IncludeOtherSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeRecurring": {
+                    "type": "boolean"
+                },
+                "IncludeRefund": {
+                    "type": "boolean"
+                },
+                "IncludeSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeSupport": {
+                    "type": "boolean"
+                },
+                "IncludeTax": {
+                    "type": "boolean"
+                },
+                "IncludeUpfront": {
+                    "type": "boolean"
+                },
+                "UseAmortized": {
+                    "type": "boolean"
+                },
+                "UseBlended": {
+                    "type": "boolean"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+        "AWS::Budgets::Budget.HistoricalOptions": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "BudgetAdjustmentPeriod": {
+                    "type": "number"
                 }
             },
             "required": [
-                "IsResponsible"
+                "BudgetAdjustmentPeriod"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable": {
+        "AWS::Budgets::Budget.Notification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ComparisonOperator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "NotificationType": {
                     "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": {
-                        "AllowedColumns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AnalysisMethod": {
-                            "type": "string"
-                        },
-                        "AnalysisRules": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "TableReference": {
-                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "AllowedColumns",
-                        "AnalysisMethod",
-                        "Name",
-                        "TableReference"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CleanRooms::ConfiguredTable"
-                    ],
-                    "type": "string"
+                "Threshold": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ThresholdType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "ComparisonOperator",
+                "NotificationType",
+                "Threshold"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
+        "AWS::Budgets::Budget.NotificationWithSubscribers": {
             "additionalProperties": false,
             "properties": {
-                "ColumnNames": {
+                "Notification": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
+                },
+                "Subscribers": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
                     },
                     "type": "array"
-                },
-                "Function": {
-                    "type": "string"
                 }
             },
             "required": [
-                "ColumnNames",
-                "Function"
+                "Notification",
+                "Subscribers"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+        "AWS::Budgets::Budget.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Key": {
                     "type": "string"
                 },
-                "Minimum": {
-                    "type": "number"
-                },
-                "Type": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "ColumnName",
-                "Minimum",
-                "Type"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+        "AWS::Budgets::Budget.Spend": {
             "additionalProperties": false,
             "properties": {
-                "Policy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                "Amount": {
+                    "type": "number"
                 },
-                "Type": {
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Policy",
-                "Type"
+                "Amount",
+                "Unit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+        "AWS::Budgets::Budget.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "AggregateColumns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
-                    },
-                    "type": "array"
-                },
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DimensionColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinRequired": {
+                "Address": {
                     "type": "string"
                 },
-                "OutputConstraints": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
-                    },
-                    "type": "array"
-                },
-                "ScalarFunctions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AggregateColumns",
-                "DimensionColumns",
-                "JoinColumns",
-                "OutputConstraints",
-                "ScalarFunctions"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
-            "additionalProperties": false,
-            "properties": {
-                "AllowedAnalyses": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AllowedAnalysisProviders": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DifferentialPrivacy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
-                }
-            },
-            "required": [
-                "AllowedAnalyses"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
-            "additionalProperties": false,
-            "properties": {
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "ListColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "JoinColumns",
-                "ListColumns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "V1": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
-                }
-            },
-            "required": [
-                "V1"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
-            "additionalProperties": false,
-            "properties": {
-                "Aggregation": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
-                },
-                "Custom": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
-                },
-                "List": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
-            "additionalProperties": false,
-            "properties": {
-                "Columns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "Columns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "Name": {
+                "SubscriptionType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name"
+                "Address",
+                "SubscriptionType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+        "AWS::Budgets::Budget.TimePeriod": {
             "additionalProperties": false,
             "properties": {
-                "DatabaseName": {
+                "End": {
                     "type": "string"
                 },
-                "TableName": {
+                "Start": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DatabaseName",
-                "TableName"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.TableReference": {
-            "additionalProperties": false,
-            "properties": {
-                "Glue": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
-                }
-            },
-            "required": [
-                "Glue"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTableAssociation": {
+        "AWS::Budgets::BudgetsAction": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27114,39 +28604,54 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfiguredTableIdentifier": {
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
+                        },
+                        "ActionType": {
                             "type": "string"
                         },
-                        "Description": {
+                        "ApprovalModel": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "BudgetName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "NotificationType": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "ConfiguredTableIdentifier",
-                        "MembershipIdentifier",
-                        "Name",
-                        "RoleArn"
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTableAssociation"
+                        "AWS::Budgets::BudgetsAction"
                     ],
                     "type": "string"
                 },
@@ -27165,158 +28670,142 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership": {
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
             "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": {
-                        "CollaborationIdentifier": {
-                            "type": "string"
-                        },
-                        "DefaultResultConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
-                        },
-                        "PaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "CollaborationIdentifier",
-                        "QueryLogStatus"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::CleanRooms::Membership"
-                    ],
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Value": {
+                    "type": "number"
                 }
             },
             "required": [
                 "Type",
-                "Properties"
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
+        "AWS::Budgets::BudgetsAction.Definition": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
+                },
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyArn": {
+                    "type": "string"
+                },
+                "Roles": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Users": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "S3"
+                "PolicyArn"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+        "AWS::Budgets::BudgetsAction.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "OutputConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "RoleArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "OutputConfiguration"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "PolicyId": {
+                    "type": "string"
+                },
+                "TargetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "IsResponsible"
+                "PolicyId",
+                "TargetIds"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "InstanceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
                     "type": "string"
                 },
-                "KeyPrefix": {
+                "Subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceIds",
+                "Region",
+                "Subtype"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
                     "type": "string"
                 },
-                "ResultFormat": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "ResultFormat"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate": {
+        "AWS::CDK::Metadata": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27351,36 +28840,15 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoRefresh": {
-                            "type": "string"
-                        },
-                        "MembershipIdentifier": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
-                        },
-                        "PrivacyBudgetType": {
+                        "Analytics": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
-                    "required": [
-                        "AutoRefresh",
-                        "MembershipIdentifier",
-                        "Parameters",
-                        "PrivacyBudgetType"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::PrivacyBudgetTemplate"
+                        "AWS::CDK::Metadata"
                     ],
                     "type": "string"
                 },
@@ -27394,28 +28862,11 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
-            "additionalProperties": false,
-            "properties": {
-                "Epsilon": {
-                    "type": "number"
-                },
-                "UsersNoisePerQuery": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Epsilon",
-                "UsersNoisePerQuery"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset": {
+        "AWS::CE::AnomalyMonitor": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27450,38 +28901,34 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "MonitorDimension": {
                             "type": "string"
                         },
-                        "Name": {
+                        "MonitorName": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "MonitorSpecification": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "MonitorType": {
+                            "type": "string"
                         },
-                        "TrainingData": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RoleArn",
-                        "TrainingData"
+                        "MonitorName",
+                        "MonitorType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRoomsML::TrainingDataset"
+                        "AWS::CE::AnomalyMonitor"
                     ],
                     "type": "string"
                 },
@@ -27500,92 +28947,23 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
-            "additionalProperties": false,
-            "properties": {
-                "ColumnName": {
-                    "type": "string"
-                },
-                "ColumnTypes": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnTypes"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "GlueDataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
-                }
-            },
-            "required": [
-                "GlueDataSource"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
-            "additionalProperties": false,
-            "properties": {
-                "InputConfig": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputConfig",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "DataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
-                },
-                "Schema": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "DataSource",
-                "Schema"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
+        "AWS::CE::AnomalyMonitor.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "CatalogId": {
-                    "type": "string"
-                },
-                "DatabaseName": {
+                "Key": {
                     "type": "string"
                 },
-                "TableName": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "DatabaseName",
-                "TableName"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2": {
+        "AWS::CE::AnomalySubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27620,52 +28998,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutomaticStopTimeMinutes": {
-                            "type": "number"
-                        },
-                        "ConnectionType": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ImageId": {
-                            "type": "string"
-                        },
-                        "InstanceType": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "OwnerArn": {
+                        "Frequency": {
                             "type": "string"
                         },
-                        "Repositories": {
+                        "MonitorArnList": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "SubnetId": {
-                            "type": "string"
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
+                            },
+                            "type": "array"
                         },
-                        "Tags": {
+                        "Subscribers": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
                             },
                             "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdExpression": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "ImageId",
-                        "InstanceType"
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cloud9::EnvironmentEC2"
+                        "AWS::CE::AnomalySubscription"
                     ],
                     "type": "string"
                 },
@@ -27684,88 +29058,42 @@
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2.Repository": {
+        "AWS::CE::AnomalySubscription.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "PathComponent": {
+                "Key": {
                     "type": "string"
                 },
-                "RepositoryUrl": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "PathComponent",
-                "RepositoryUrl"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::CustomResource": {
+        "AWS::CE::AnomalySubscription.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Address": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Status": {
                     "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": {
-                        "ServiceToken": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "ServiceToken"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::CloudFormation::CustomResource"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookDefaultVersion": {
+        "AWS::CE::CostCategory": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27800,21 +29128,32 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "DefaultValue": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "Name": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "RuleVersion": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "type": "string"
+                        },
+                        "SplitChargeRules": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "RuleVersion",
+                        "Rules"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookDefaultVersion"
+                        "AWS::CE::CostCategory"
                     ],
                     "type": "string"
                 },
@@ -27828,11 +29167,12 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookTypeConfig": {
+        "AWS::CUR::ReportDefinition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27867,27 +29207,65 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
+                        "AdditionalArtifacts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdditionalSchemaElements": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BillingViewArn": {
                             "type": "string"
                         },
-                        "ConfigurationAlias": {
+                        "Compression": {
                             "type": "string"
                         },
-                        "TypeArn": {
+                        "Format": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "RefreshClosedReports": {
+                            "type": "boolean"
+                        },
+                        "ReportName": {
+                            "type": "string"
+                        },
+                        "ReportVersioning": {
+                            "type": "string"
+                        },
+                        "S3Bucket": {
+                            "type": "string"
+                        },
+                        "S3Prefix": {
+                            "type": "string"
+                        },
+                        "S3Region": {
+                            "type": "string"
+                        },
+                        "TimeUnit": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Configuration"
+                        "Compression",
+                        "Format",
+                        "RefreshClosedReports",
+                        "ReportName",
+                        "ReportVersioning",
+                        "S3Bucket",
+                        "S3Prefix",
+                        "S3Region",
+                        "TimeUnit"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookTypeConfig"
+                        "AWS::CUR::ReportDefinition"
                     ],
                     "type": "string"
                 },
@@ -27906,7 +29284,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion": {
+        "AWS::Cassandra::Keyspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27941,28 +29319,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
-                        },
-                        "SchemaHandlerPackage": {
-                            "type": "string"
+                        "ReplicationSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
                         },
-                        "TypeName": {
-                            "type": "string"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
-                    "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookVersion"
+                        "AWS::Cassandra::Keyspace"
                     ],
                     "type": "string"
                 },
@@ -27976,24 +29350,26 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion.LoggingConfig": {
+        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
-                    "type": "string"
+                "RegionList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "LogRoleArn": {
+                "ReplicationStrategy": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::CloudFormation::Macro": {
+        "AWS::Cassandra::Table": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28028,31 +29404,70 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "AutoScalingSpecifications": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
                         },
-                        "FunctionName": {
-                            "type": "string"
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
                         },
-                        "LogGroupName": {
-                            "type": "string"
+                        "ClientSideTimestampsEnabled": {
+                            "type": "boolean"
                         },
-                        "LogRoleARN": {
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultTimeToLive": {
+                            "type": "number"
+                        },
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
+                        },
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "PartitionKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "PointInTimeRecoveryEnabled": {
+                            "type": "boolean"
+                        },
+                        "RegularColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "ReplicaSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TableName": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "FunctionName",
-                        "Name"
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Macro"
+                        "AWS::Cassandra::Table"
                     ],
                     "type": "string"
                 },
@@ -28071,81 +29486,169 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleDefaultVersion": {
+        "AWS::Cassandra::Table.AutoScalingSetting": {
             "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"
+                "AutoScalingDisabled": {
+                    "type": "boolean"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Arn": {
-                            "type": "string"
-                        },
-                        "ModuleName": {
-                            "type": "string"
-                        },
-                        "VersionId": {
-                            "type": "string"
-                        }
-                    },
-                    "type": "object"
+                "MaximumUnits": {
+                    "type": "number"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CloudFormation::ModuleDefaultVersion"
-                    ],
-                    "type": "string"
+                "MinimumUnits": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "ScalingPolicy": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
                 }
             },
-            "required": [
-                "Type"
-            ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleVersion": {
+        "AWS::Cassandra::Table.AutoScalingSpecification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
                 },
-                "DeletionPolicy": {
-                    "enum": [
+                "WriteCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.BillingMode": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                },
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                },
+                "OrderBy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Column"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "ColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "ColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.EncryptionSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKeyIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
                         "Delete",
                         "Retain",
                         "Snapshot"
@@ -28173,22 +29676,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ModuleName": {
-                            "type": "string"
-                        },
-                        "ModulePackage": {
-                            "type": "string"
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
                         }
                     },
                     "required": [
-                        "ModuleName",
-                        "ModulePackage"
+                        "ExpiryEventsConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleVersion"
+                        "AWS::CertificateManager::Account"
                     ],
                     "type": "string"
                 },
@@ -28207,7 +29706,16 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::PublicTypeVersion": {
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28242,27 +29750,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "CertificateAuthorityArn": {
                             "type": "string"
                         },
-                        "LogDeliveryBucket": {
+                        "CertificateTransparencyLoggingPreference": {
                             "type": "string"
                         },
-                        "PublicVersionNumber": {
+                        "DomainName": {
                             "type": "string"
                         },
-                        "Type": {
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "KeyAlgorithm": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DomainName"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::PublicTypeVersion"
+                        "AWS::CertificateManager::Certificate"
                     ],
                     "type": "string"
                 },
@@ -28276,11 +29805,30 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::Publisher": {
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28315,21 +29863,58 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AcceptTermsAndConditions": {
-                            "type": "boolean"
+                        "ConfigurationName": {
+                            "type": "string"
                         },
-                        "ConnectionArn": {
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TeamId": {
                             "type": "string"
+                        },
+                        "TeamsChannelId": {
+                            "type": "string"
+                        },
+                        "TeamsTenantId": {
+                            "type": "string"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "AcceptTermsAndConditions"
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "TeamId",
+                        "TeamsChannelId",
+                        "TeamsTenantId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Publisher"
+                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -28348,7 +29933,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceDefaultVersion": {
+        "AWS::Chatbot::SlackChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28383,21 +29968,54 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
                             "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceDefaultVersion"
+                        "AWS::Chatbot::SlackChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -28411,11 +30029,12 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion": {
+        "AWS::CleanRooms::AnalysisTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28450,28 +30069,45 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "AnalysisParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        "Format": {
+                            "type": "string"
                         },
-                        "SchemaHandlerPackage": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "Format",
+                        "MembershipIdentifier",
+                        "Name",
+                        "Source"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceVersion"
+                        "AWS::CleanRooms::AnalysisTemplate"
                     ],
                     "type": "string"
                 },
@@ -28490,19 +30126,53 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "DefaultValue": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Name",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::Stack": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferencedTables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ReferencedTables"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28537,42 +30207,56 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "NotificationARNs": {
+                        "CreatorDisplayName": {
+                            "type": "string"
+                        },
+                        "CreatorMemberAbilities": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Parameters": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
+                        "CreatorPaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
                         },
-                        "Tags": {
+                        "DataEncryptionMetadata": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Members": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
                             },
                             "type": "array"
                         },
-                        "TemplateURL": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TimeoutInMinutes": {
-                            "type": "number"
+                        "QueryLogStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "TemplateURL"
+                        "CreatorDisplayName",
+                        "CreatorMemberAbilities",
+                        "Description",
+                        "Members",
+                        "Name",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Stack"
+                        "AWS::CleanRooms::Collaboration"
                     ],
                     "type": "string"
                 },
@@ -28591,7 +30275,81 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet": {
+        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCleartext": {
+                    "type": "boolean"
+                },
+                "AllowDuplicates": {
+                    "type": "boolean"
+                },
+                "AllowJoinsOnColumnsWithDifferentNames": {
+                    "type": "boolean"
+                },
+                "PreserveNulls": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowCleartext",
+                "AllowDuplicates",
+                "AllowJoinsOnColumnsWithDifferentNames",
+                "PreserveNulls"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "MemberAbilities": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PaymentConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                }
+            },
+            "required": [
+                "AccountId",
+                "DisplayName",
+                "MemberAbilities"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28626,73 +30384,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdministrationRoleARN": {
-                            "type": "string"
-                        },
-                        "AutoDeployment": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
-                        },
-                        "CallAs": {
-                            "type": "string"
-                        },
-                        "Capabilities": {
+                        "AllowedColumns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ExecutionRoleName": {
+                        "AnalysisMethod": {
                             "type": "string"
                         },
-                        "ManagedExecution": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
-                        },
-                        "OperationPreferences": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
-                        },
-                        "Parameters": {
+                        "AnalysisRules": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
                             },
                             "type": "array"
                         },
-                        "PermissionModel": {
+                        "Description": {
                             "type": "string"
                         },
-                        "StackInstancesGroup": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
-                            },
-                            "type": "array"
-                        },
-                        "StackSetName": {
+                        "Name": {
                             "type": "string"
                         },
+                        "TableReference": {
+                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TemplateBody": {
-                            "type": "string"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "PermissionModel",
-                        "StackSetName"
+                        "AllowedColumns",
+                        "AnalysisMethod",
+                        "Name",
+                        "TableReference"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::StackSet"
+                        "AWS::CleanRooms::ConfiguredTable"
                     ],
                     "type": "string"
                 },
@@ -28711,107 +30444,168 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.AutoDeployment": {
+        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "RetainStacksOnAccountRemoval": {
-                    "type": "boolean"
+                "Function": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ColumnNames",
+                "Function"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
             "additionalProperties": false,
             "properties": {
-                "AccountFilterType": {
+                "ColumnName": {
                     "type": "string"
                 },
-                "Accounts": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Minimum": {
+                    "type": "number"
                 },
-                "AccountsUrl": {
+                "Type": {
                     "type": "string"
-                },
-                "OrganizationalUnitIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Minimum",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.ManagedExecution": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
             "additionalProperties": false,
             "properties": {
-                "Active": {
-                    "type": "boolean"
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "Policy",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.OperationPreferences": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
             "additionalProperties": false,
             "properties": {
-                "FailureToleranceCount": {
-                    "type": "number"
+                "AdditionalAnalyses": {
+                    "type": "string"
                 },
-                "FailureTolerancePercentage": {
-                    "type": "number"
+                "AggregateColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
+                    },
+                    "type": "array"
                 },
-                "MaxConcurrentCount": {
-                    "type": "number"
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "MaxConcurrentPercentage": {
-                    "type": "number"
+                "DimensionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "RegionConcurrencyType": {
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinRequired": {
                     "type": "string"
                 },
-                "RegionOrder": {
+                "OutputConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                    },
+                    "type": "array"
+                },
+                "ScalarFunctions": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 }
             },
+            "required": [
+                "AggregateColumns",
+                "DimensionColumns",
+                "JoinColumns",
+                "OutputConstraints",
+                "ScalarFunctions"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.Parameter": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
             "additionalProperties": false,
             "properties": {
-                "ParameterKey": {
+                "AdditionalAnalyses": {
                     "type": "string"
                 },
-                "ParameterValue": {
-                    "type": "string"
+                "AllowedAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedAnalysisProviders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DifferentialPrivacy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                },
+                "DisallowedOutputColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "ParameterKey",
-                "ParameterValue"
+                "AllowedAnalyses"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.StackInstances": {
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
             "additionalProperties": false,
             "properties": {
-                "DeploymentTargets": {
-                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                "AdditionalAnalyses": {
+                    "type": "string"
                 },
-                "ParameterOverrides": {
+                "AllowedJoinOperators": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "Regions": {
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ListColumns": {
                     "items": {
                         "type": "string"
                     },
@@ -28819,12 +30613,94 @@
                 }
             },
             "required": [
-                "DeploymentTargets",
-                "Regions"
+                "JoinColumns",
+                "ListColumns"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation": {
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.TableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Glue": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
+                }
+            },
+            "required": [
+                "Glue"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28859,42 +30735,45 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoUpdate": {
-                            "type": "boolean"
-                        },
-                        "ExecutionRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
-                        },
-                        "MajorVersion": {
-                            "type": "string"
+                        "ConfiguredTableAssociationAnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule"
+                            },
+                            "type": "array"
                         },
-                        "PublicTypeArn": {
+                        "ConfiguredTableIdentifier": {
                             "type": "string"
                         },
-                        "PublisherId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "Type": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeNameAlias": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "VersionBump": {
-                            "type": "string"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ConfiguredTableIdentifier",
+                        "MembershipIdentifier",
+                        "Name",
+                        "RoleArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::TypeActivation"
+                        "AWS::CleanRooms::ConfiguredTableAssociation"
                     ],
                     "type": "string"
                 },
@@ -28908,31 +30787,114 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
-                    "type": "string"
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy"
                 },
-                "LogRoleArn": {
+                "Type": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Policy",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitCondition": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
-                "CreationPolicy": {
-                    "type": "object"
-                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -28962,21 +30924,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Count": {
-                            "type": "number"
+                        "Description": {
+                            "type": "string"
                         },
-                        "Handle": {
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig"
+                        },
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Timeout": {
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitCondition"
+                        "AWS::CleanRooms::IdMappingTable"
                     ],
                     "type": "string"
                 },
@@ -28990,11 +30969,59 @@
                 }
             },
             "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingTableInputSource": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "IdMappingTableInputSource"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "IdNamespaceAssociationId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdNamespaceAssociationId",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitConditionHandle": {
+        "AWS::CleanRooms::IdNamespaceAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29028,12 +31055,39 @@
                 },
                 "Properties": {
                     "additionalProperties": false,
-                    "properties": {},
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IdMappingConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig"
+                        },
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitConditionHandle"
+                        "AWS::CleanRooms::IdNamespaceAssociation"
                     ],
                     "type": "string"
                 },
@@ -29047,21 +31101,65 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy": {
+        "AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "AllowUseAsDimensionColumn": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowUseAsDimensionColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingWorkflowsSupported": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "IdNamespaceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
                     ],
                     "type": "string"
                 },
@@ -29086,18 +31184,34 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CachePolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        "CollaborationIdentifier": {
+                            "type": "string"
+                        },
+                        "DefaultResultConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
+                        },
+                        "PaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
+                        },
+                        "QueryLogStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "CachePolicyConfig"
+                        "CollaborationIdentifier",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CachePolicy"
+                        "AWS::CleanRooms::Membership"
                     ],
                     "type": "string"
                 },
@@ -29116,119 +31230,77 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "MaxTTL": {
-                    "type": "number"
-                },
-                "MinTTL": {
-                    "type": "number"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "ParametersInCacheKeyAndForwardedToOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
                 }
             },
             "required": [
-                "DefaultTTL",
-                "MaxTTL",
-                "MinTTL",
-                "Name",
-                "ParametersInCacheKeyAndForwardedToOrigin"
+                "QueryCompute"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CookieBehavior": {
-                    "type": "string"
-                },
-                "Cookies": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "S3": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
                 }
             },
             "required": [
-                "CookieBehavior"
+                "S3"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "HeaderBehavior": {
-                    "type": "string"
+                "OutputConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
                 },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "RoleArn": {
+                    "type": "string"
                 }
             },
             "required": [
-                "HeaderBehavior"
+                "OutputConfiguration"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
+        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
             "additionalProperties": false,
             "properties": {
-                "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
-                },
-                "EnableAcceptEncodingBrotli": {
-                    "type": "boolean"
-                },
-                "EnableAcceptEncodingGzip": {
+                "IsResponsible": {
                     "type": "boolean"
-                },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
-                },
-                "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
                 }
             },
             "required": [
-                "CookiesConfig",
-                "EnableAcceptEncodingGzip",
-                "HeadersConfig",
-                "QueryStringsConfig"
+                "IsResponsible"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "QueryStringBehavior": {
+                "Bucket": {
                     "type": "string"
                 },
-                "QueryStrings": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "ResultFormat": {
+                    "type": "string"
                 }
             },
             "required": [
-                "QueryStringBehavior"
+                "Bucket",
+                "ResultFormat"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29263,18 +31335,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CloudFrontOriginAccessIdentityConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        "AutoRefresh": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        },
+                        "PrivacyBudgetType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "CloudFrontOriginAccessIdentityConfig"
+                        "AutoRefresh",
+                        "MembershipIdentifier",
+                        "Parameters",
+                        "PrivacyBudgetType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        "AWS::CleanRooms::PrivacyBudgetTemplate"
                     ],
                     "type": "string"
                 },
@@ -29293,19 +31383,23 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
+                "Epsilon": {
+                    "type": "number"
+                },
+                "UsersNoisePerQuery": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Comment"
+                "Epsilon",
+                "UsersNoisePerQuery"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+        "AWS::CleanRoomsML::TrainingDataset": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29340,18 +31434,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContinuousDeploymentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrainingData": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ContinuousDeploymentPolicyConfig"
+                        "Name",
+                        "RoleArn",
+                        "TrainingData"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                        "AWS::CleanRoomsML::TrainingDataset"
                     ],
                     "type": "string"
                 },
@@ -29370,134 +31484,207 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "SingleHeaderPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
-                },
-                "SingleWeightPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                "ColumnName": {
+                    "type": "string"
                 },
-                "StagingDistributionDnsNames": {
+                "ColumnTypes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
-                },
-                "TrafficConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
-                },
-                "Type": {
-                    "type": "string"
                 }
             },
             "required": [
-                "Enabled",
-                "StagingDistributionDnsNames"
+                "ColumnName",
+                "ColumnTypes"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
             "additionalProperties": false,
             "properties": {
-                "IdleTTL": {
-                    "type": "number"
-                },
-                "MaximumTTL": {
-                    "type": "number"
+                "GlueDataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
                 }
             },
             "required": [
-                "IdleTTL",
-                "MaximumTTL"
+                "GlueDataSource"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
-                    "type": "string"
+                "InputConfig": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
                 },
-                "Value": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "InputConfig",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
-                    "type": "string"
+                "DataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
                 },
-                "Value": {
-                    "type": "string"
+                "Schema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "DataSource",
+                "Schema"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "CatalogId": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Weight"
+                "DatabaseName",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+        "AWS::Cloud9::EnvironmentEC2": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "Condition": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "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": {
+                        "AutomaticStopTimeMinutes": {
+                            "type": "number"
+                        },
+                        "ConnectionType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OwnerArn": {
+                            "type": "string"
+                        },
+                        "Repositories": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cloud9::EnvironmentEC2"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "Weight"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
             "additionalProperties": false,
             "properties": {
-                "SingleHeaderConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
-                },
-                "SingleWeightConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                "PathComponent": {
+                    "type": "string"
                 },
-                "Type": {
+                "RepositoryUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "PathComponent",
+                "RepositoryUrl"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution": {
+        "AWS::CloudFormation::CustomResource": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29532,24 +31719,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        "ServiceTimeout": {
+                            "type": "number"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "ServiceToken": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DistributionConfig"
+                        "ServiceToken"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Distribution"
+                        "AWS::CloudFormation::CustomResource"
                     ],
                     "type": "string"
                 },
@@ -29568,685 +31752,657 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CacheBehavior": {
+        "AWS::CloudFormation::HookDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CachePolicyId": {
+                "Condition": {
                     "type": "string"
                 },
-                "CachedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "LambdaFunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                },
-                "MaxTTL": {
-                    "type": "number"
-                },
-                "MinTTL": {
-                    "type": "number"
+                    "type": "object"
                 },
-                "OriginRequestPolicyId": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookDefaultVersion"
+                    ],
                     "type": "string"
                 },
-                "PathPattern": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                },
-                "RealtimeLogConfigArn": {
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::HookTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
                     "type": "string"
                 },
-                "ResponseHeadersPolicyId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "TargetOriginId": {
-                    "type": "string"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "ConfigurationAlias": {
+                            "type": "string"
+                        },
+                        "TypeArn": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "Configuration"
+                    ],
+                    "type": "object"
                 },
-                "TrustedSigners": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookTypeConfig"
+                    ],
+                    "type": "string"
                 },
-                "ViewerProtocolPolicy": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "PathPattern",
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Cookies": {
+        "AWS::CloudFormation::HookVersion": {
             "additionalProperties": false,
             "properties": {
-                "Forward": {
+                "Condition": {
                     "type": "string"
                 },
-                "WhitelistedNames": {
-                    "items": {
-                        "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": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "Forward"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+        "AWS::CloudFormation::HookVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "ErrorCachingMinTTL": {
-                    "type": "number"
-                },
-                "ErrorCode": {
-                    "type": "number"
-                },
-                "ResponseCode": {
-                    "type": "number"
+                "LogGroupName": {
+                    "type": "string"
                 },
-                "ResponsePagePath": {
+                "LogRoleArn": {
                     "type": "string"
                 }
             },
-            "required": [
-                "ErrorCode"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+        "AWS::CloudFormation::Macro": {
             "additionalProperties": false,
             "properties": {
-                "HTTPPort": {
-                    "type": "number"
-                },
-                "HTTPSPort": {
-                    "type": "number"
-                },
-                "OriginKeepaliveTimeout": {
-                    "type": "number"
+                "Condition": {
+                    "type": "string"
                 },
-                "OriginProtocolPolicy": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "OriginReadTimeout": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginSSLProtocols": {
-                    "items": {
-                        "type": "string"
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "OriginProtocolPolicy"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
+        "AWS::CloudFormation::ModuleDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CachePolicyId": {
+                "Condition": {
                     "type": "string"
                 },
-                "CachedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "LambdaFunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                },
-                "MaxTTL": {
-                    "type": "number"
-                },
-                "MinTTL": {
-                    "type": "number"
-                },
-                "OriginRequestPolicyId": {
-                    "type": "string"
-                },
-                "RealtimeLogConfigArn": {
-                    "type": "string"
-                },
-                "ResponseHeadersPolicyId": {
-                    "type": "string"
-                },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                    "type": "object"
                 },
-                "TargetOriginId": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
                     "type": "string"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TrustedSigners": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "ViewerProtocolPolicy": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.DistributionConfig": {
+        "AWS::CloudFormation::ModuleVersion": {
             "additionalProperties": false,
             "properties": {
-                "Aliases": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CNAMEs": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "CacheBehaviors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CacheBehavior"
-                    },
-                    "type": "array"
-                },
-                "Comment": {
-                    "type": "string"
-                },
-                "ContinuousDeploymentPolicyId": {
-                    "type": "string"
-                },
-                "CustomErrorResponses": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomErrorResponse"
-                    },
-                    "type": "array"
-                },
-                "CustomOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyCustomOrigin"
-                },
-                "DefaultCacheBehavior": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.DefaultCacheBehavior"
-                },
-                "DefaultRootObject": {
+                "Condition": {
                     "type": "string"
                 },
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "HttpVersion": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "IPV6Enabled": {
-                    "type": "boolean"
-                },
-                "Logging": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Logging"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginGroups": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroups"
+                "Metadata": {
+                    "type": "object"
                 },
-                "Origins": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.Origin"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "ModuleName",
+                        "ModulePackage"
+                    ],
+                    "type": "object"
                 },
-                "PriceClass": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleVersion"
+                    ],
                     "type": "string"
                 },
-                "Restrictions": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Restrictions"
-                },
-                "S3Origin": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyS3Origin"
-                },
-                "Staging": {
-                    "type": "boolean"
-                },
-                "ViewerCertificate": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
-                },
-                "WebACLId": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "DefaultCacheBehavior",
-                "Enabled"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.ForwardedValues": {
+        "AWS::CloudFormation::PublicTypeVersion": {
             "additionalProperties": false,
             "properties": {
-                "Cookies": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
-                },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Condition": {
+                    "type": "string"
                 },
-                "QueryString": {
-                    "type": "boolean"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "QueryStringCacheKeys": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "QueryString"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.FunctionAssociation": {
-            "additionalProperties": false,
-            "properties": {
-                "EventType": {
-                    "type": "string"
-                },
-                "FunctionARN": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.GeoRestriction": {
-            "additionalProperties": false,
-            "properties": {
-                "Locations": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "RestrictionType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RestrictionType"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.LambdaFunctionAssociation": {
-            "additionalProperties": false,
-            "properties": {
-                "EventType": {
-                    "type": "string"
-                },
-                "IncludeBody": {
-                    "type": "boolean"
-                },
-                "LambdaFunctionARN": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.LegacyCustomOrigin": {
-            "additionalProperties": false,
-            "properties": {
-                "DNSName": {
-                    "type": "string"
-                },
-                "HTTPPort": {
-                    "type": "number"
-                },
-                "HTTPSPort": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginProtocolPolicy": {
-                    "type": "string"
+                "Metadata": {
+                    "type": "object"
                 },
-                "OriginSSLProtocols": {
-                    "items": {
-                        "type": "string"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "LogDeliveryBucket": {
+                            "type": "string"
+                        },
+                        "PublicVersionNumber": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "DNSName",
-                "OriginProtocolPolicy",
-                "OriginSSLProtocols"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.LegacyS3Origin": {
-            "additionalProperties": false,
-            "properties": {
-                "DNSName": {
-                    "type": "string"
+                    "type": "object"
                 },
-                "OriginAccessIdentity": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "DNSName"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.Logging": {
-            "additionalProperties": false,
-            "properties": {
-                "Bucket": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::PublicTypeVersion"
+                    ],
                     "type": "string"
                 },
-                "IncludeCookies": {
-                    "type": "boolean"
-                },
-                "Prefix": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Origin": {
+        "AWS::CloudFormation::Publisher": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionAttempts": {
-                    "type": "number"
-                },
-                "ConnectionTimeout": {
-                    "type": "number"
-                },
-                "CustomOriginConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
-                },
-                "DomainName": {
-                    "type": "string"
-                },
-                "Id": {
+                "Condition": {
                     "type": "string"
                 },
-                "OriginAccessControlId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "OriginCustomHeaders": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginCustomHeader"
-                    },
-                    "type": "array"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "OriginPath": {
-                    "type": "string"
+                "Metadata": {
+                    "type": "object"
                 },
-                "OriginShield": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginShield"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptTermsAndConditions"
+                    ],
+                    "type": "object"
                 },
-                "S3OriginConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.S3OriginConfig"
-                }
-            },
-            "required": [
-                "DomainName",
-                "Id"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginCustomHeader": {
-            "additionalProperties": false,
-            "properties": {
-                "HeaderName": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Publisher"
+                    ],
                     "type": "string"
                 },
-                "HeaderValue": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "HeaderName",
-                "HeaderValue"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.OriginGroup": {
+        "AWS::CloudFormation::ResourceDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "FailoverCriteria": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
-                },
-                "Id": {
+                "Condition": {
                     "type": "string"
                 },
-                "Members": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMembers"
-                }
-            },
-            "required": [
-                "FailoverCriteria",
-                "Id",
-                "Members"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroupFailoverCriteria": {
-            "additionalProperties": false,
-            "properties": {
-                "StatusCodes": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.StatusCodes"
-                }
-            },
-            "required": [
-                "StatusCodes"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroupMember": {
-            "additionalProperties": false,
-            "properties": {
-                "OriginId": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "OriginId"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroupMembers": {
-            "additionalProperties": false,
-            "properties": {
-                "Items": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMember"
-                    },
-                    "type": "array"
                 },
-                "Quantity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Items",
-                "Quantity"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginGroups": {
-            "additionalProperties": false,
-            "properties": {
-                "Items": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroup"
-                    },
-                    "type": "array"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "Quantity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Quantity"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.OriginShield": {
-            "additionalProperties": false,
-            "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "Metadata": {
+                    "type": "object"
                 },
-                "OriginShieldRegion": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.Restrictions": {
-            "additionalProperties": false,
-            "properties": {
-                "GeoRestriction": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.GeoRestriction"
-                }
-            },
-            "required": [
-                "GeoRestriction"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.S3OriginConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "OriginAccessIdentity": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.StatusCodes": {
-            "additionalProperties": false,
-            "properties": {
-                "Items": {
-                    "items": {
-                        "type": "number"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
-                },
-                "Quantity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Items",
-                "Quantity"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Distribution.ViewerCertificate": {
-            "additionalProperties": false,
-            "properties": {
-                "AcmCertificateArn": {
-                    "type": "string"
-                },
-                "CloudFrontDefaultCertificate": {
-                    "type": "boolean"
-                },
-                "IamCertificateId": {
-                    "type": "string"
+                    "type": "object"
                 },
-                "MinimumProtocolVersion": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
                     "type": "string"
                 },
-                "SslSupportMethod": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFront::Function": {
+        "AWS::CloudFormation::ResourceVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30281,32 +32437,28 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoPublish": {
-                            "type": "boolean"
-                        },
-                        "FunctionCode": {
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "FunctionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
                         },
-                        "FunctionMetadata": {
-                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionMetadata"
+                        "SchemaHandlerPackage": {
+                            "type": "string"
                         },
-                        "Name": {
+                        "TypeName": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "FunctionCode",
-                        "FunctionConfig",
-                        "Name"
+                        "SchemaHandlerPackage",
+                        "TypeName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Function"
+                        "AWS::CloudFormation::ResourceVersion"
                     ],
                     "type": "string"
                 },
@@ -30325,50 +32477,19 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Function.FunctionConfig": {
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "LogGroupName": {
                     "type": "string"
                 },
-                "KeyValueStoreAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Function.KeyValueStoreAssociation"
-                    },
-                    "type": "array"
-                },
-                "Runtime": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Comment",
-                "Runtime"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::Function.FunctionMetadata": {
-            "additionalProperties": false,
-            "properties": {
-                "FunctionARN": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::Function.KeyValueStoreAssociation": {
-            "additionalProperties": false,
-            "properties": {
-                "KeyValueStoreARN": {
+                "LogRoleArn": {
                     "type": "string"
                 }
             },
-            "required": [
-                "KeyValueStoreARN"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::KeyGroup": {
+        "AWS::CloudFormation::Stack": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30403,18 +32524,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "KeyGroupConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
+                        "NotificationARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
                         }
                     },
                     "required": [
-                        "KeyGroupConfig"
+                        "TemplateURL"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::KeyGroup"
+                        "AWS::CloudFormation::Stack"
                     ],
                     "type": "string"
                 },
@@ -30433,29 +32578,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::KeyGroup.KeyGroupConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Comment": {
-                    "type": "string"
-                },
-                "Items": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Items",
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::KeyValueStore": {
+        "AWS::CloudFormation::StackSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30490,24 +32613,73 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Comment": {
+                        "AdministrationRoleARN": {
                             "type": "string"
                         },
-                        "ImportSource": {
-                            "$ref": "#/definitions/AWS::CloudFront::KeyValueStore.ImportSource"
+                        "AutoDeployment": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
                         },
-                        "Name": {
+                        "CallAs": {
+                            "type": "string"
+                        },
+                        "Capabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleName": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
+                        },
+                        "OperationPreferences": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionModel": {
+                            "type": "string"
+                        },
+                        "StackInstancesGroup": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                            },
+                            "type": "array"
+                        },
+                        "StackSetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateURL": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Name"
+                        "PermissionModel",
+                        "StackSetName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::KeyValueStore"
+                        "AWS::CloudFormation::StackSet"
                     ],
                     "type": "string"
                 },
@@ -30526,23 +32698,123 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::KeyValueStore.ImportSource": {
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
             "additionalProperties": false,
             "properties": {
-                "SourceArn": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountFilterType": {
                     "type": "string"
                 },
-                "SourceType": {
+                "Accounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AccountsUrl": {
+                    "type": "string"
+                },
+                "OrganizationalUnitIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.ManagedExecution": {
+            "additionalProperties": false,
+            "properties": {
+                "Active": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrencyMode": {
+                    "type": "string"
+                },
+                "FailureToleranceCount": {
+                    "type": "number"
+                },
+                "FailureTolerancePercentage": {
+                    "type": "number"
+                },
+                "MaxConcurrentCount": {
+                    "type": "number"
+                },
+                "MaxConcurrentPercentage": {
+                    "type": "number"
+                },
+                "RegionConcurrencyType": {
+                    "type": "string"
+                },
+                "RegionOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterKey": {
+                    "type": "string"
+                },
+                "ParameterValue": {
                     "type": "string"
                 }
             },
             "required": [
-                "SourceArn",
-                "SourceType"
+                "ParameterKey",
+                "ParameterValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::MonitoringSubscription": {
+        "AWS::CloudFormation::StackSet.StackInstances": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentTargets": {
+                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                },
+                "ParameterOverrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                    },
+                    "type": "array"
+                },
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DeploymentTargets",
+                "Regions"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::TypeActivation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30577,22 +32849,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionId": {
+                        "AutoUpdate": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "MonitoringSubscription": {
-                            "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.MonitoringSubscription"
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
+                        },
+                        "MajorVersion": {
+                            "type": "string"
+                        },
+                        "PublicTypeArn": {
+                            "type": "string"
+                        },
+                        "PublisherId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeNameAlias": {
+                            "type": "string"
+                        },
+                        "VersionBump": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DistributionId",
-                        "MonitoringSubscription"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::MonitoringSubscription"
+                        "AWS::CloudFormation::TypeActivation"
                     ],
                     "type": "string"
                 },
@@ -30606,38 +32898,31 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::MonitoringSubscription.MonitoringSubscription": {
-            "additionalProperties": false,
-            "properties": {
-                "RealtimeMetricsSubscriptionConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig": {
+        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "RealtimeMetricsSubscriptionStatus": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
                     "type": "string"
                 }
             },
-            "required": [
-                "RealtimeMetricsSubscriptionStatus"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginAccessControl": {
+        "AWS::CloudFormation::WaitCondition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
+                "CreationPolicy": {
+                    "type": "object"
+                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -30667,18 +32952,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "OriginAccessControlConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig"
+                        "Count": {
+                            "type": "number"
+                        },
+                        "Handle": {
+                            "type": "string"
+                        },
+                        "Timeout": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "OriginAccessControlConfig"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::OriginAccessControl"
+                        "AWS::CloudFormation::WaitCondition"
                     ],
                     "type": "string"
                 },
@@ -30692,39 +32980,68 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig": {
+        "AWS::CloudFormation::WaitConditionHandle": {
             "additionalProperties": false,
             "properties": {
-                "Description": {
+                "Condition": {
                     "type": "string"
                 },
-                "Name": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "OriginAccessControlOriginType": {
-                    "type": "string"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "SigningBehavior": {
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {},
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitConditionHandle"
+                    ],
                     "type": "string"
                 },
-                "SigningProtocol": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Name",
-                "OriginAccessControlOriginType",
-                "SigningBehavior",
-                "SigningProtocol"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy": {
+        "AWS::CloudFront::CachePolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30759,18 +33076,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "OriginRequestPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        "CachePolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
                         }
                     },
                     "required": [
-                        "OriginRequestPolicyConfig"
+                        "CachePolicyConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::OriginRequestPolicy"
+                        "AWS::CloudFront::CachePolicy"
                     ],
                     "type": "string"
                 },
@@ -30789,7 +33106,38 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
+        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ParametersInCacheKeyAndForwardedToOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                }
+            },
+            "required": [
+                "DefaultTTL",
+                "MaxTTL",
+                "MinTTL",
+                "Name",
+                "ParametersInCacheKeyAndForwardedToOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CookiesConfig": {
             "additionalProperties": false,
             "properties": {
                 "CookieBehavior": {
@@ -30807,7 +33155,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
+        "AWS::CloudFront::CachePolicy.HeadersConfig": {
             "additionalProperties": false,
             "properties": {
                 "HeaderBehavior": {
@@ -30825,34 +33173,34 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
-                },
                 "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
                 },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.HeadersConfig"
+                "EnableAcceptEncodingBrotli": {
+                    "type": "boolean"
                 },
-                "Name": {
-                    "type": "string"
+                "EnableAcceptEncodingGzip": {
+                    "type": "boolean"
+                },
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
                 },
                 "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig"
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
                 }
             },
             "required": [
                 "CookiesConfig",
+                "EnableAcceptEncodingGzip",
                 "HeadersConfig",
-                "Name",
                 "QueryStringsConfig"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
+        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
             "additionalProperties": false,
             "properties": {
                 "QueryStringBehavior": {
@@ -30870,7 +33218,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::PublicKey": {
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30905,18 +33253,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "PublicKeyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
+                        "CloudFrontOriginAccessIdentityConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
                         }
                     },
                     "required": [
-                        "PublicKeyConfig"
+                        "CloudFrontOriginAccessIdentityConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::PublicKey"
+                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
                     ],
                     "type": "string"
                 },
@@ -30935,30 +33283,19 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
             "additionalProperties": false,
             "properties": {
-                "CallerReference": {
-                    "type": "string"
-                },
                 "Comment": {
                     "type": "string"
-                },
-                "EncodedKey": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
                 }
             },
             "required": [
-                "CallerReference",
-                "EncodedKey",
-                "Name"
+                "Comment"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::RealtimeLogConfig": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -30993,36 +33330,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EndPoints": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.EndPoint"
-                            },
-                            "type": "array"
-                        },
-                        "Fields": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "SamplingRate": {
-                            "type": "number"
+                        "ContinuousDeploymentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
                         }
                     },
                     "required": [
-                        "EndPoints",
-                        "Fields",
-                        "Name",
-                        "SamplingRate"
+                        "ContinuousDeploymentPolicyConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::RealtimeLogConfig"
+                        "AWS::CloudFront::ContinuousDeploymentPolicy"
                     ],
                     "type": "string"
                 },
@@ -31041,50 +33360,145 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "KinesisStreamConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "StreamType": {
+                "SingleHeaderPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                },
+                "SingleWeightPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                },
+                "StagingDistributionDnsNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrafficConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "KinesisStreamConfig",
-                "StreamType"
+                "Enabled",
+                "StagingDistributionDnsNames"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
             "additionalProperties": false,
             "properties": {
-                "RoleArn": {
-                    "type": "string"
+                "IdleTTL": {
+                    "type": "number"
                 },
-                "StreamArn": {
-                    "type": "string"
+                "MaximumTTL": {
+                    "type": "number"
                 }
             },
             "required": [
-                "RoleArn",
-                "StreamArn"
+                "IdleTTL",
+                "MaximumTTL"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy": {
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Header": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SingleHeaderConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                },
+                "SingleWeightConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
                 "DependsOn": {
@@ -31108,18 +33522,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ResponseHeadersPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
+                        "DistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ResponseHeadersPolicyConfig"
+                        "DistributionConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ResponseHeadersPolicy"
+                        "AWS::CloudFront::Distribution"
                     ],
                     "type": "string"
                 },
@@ -31138,25 +33558,102 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
+        "AWS::CloudFront::Distribution.CacheBehavior": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "PathPattern": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Items"
+                "PathPattern",
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
+        "AWS::CloudFront::Distribution.Cookies": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "Forward": {
+                    "type": "string"
+                },
+                "WhitelistedNames": {
                     "items": {
                         "type": "string"
                     },
@@ -31164,14 +33661,50 @@
                 }
             },
             "required": [
-                "Items"
+                "Forward"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
+        "AWS::CloudFront::Distribution.CustomErrorResponse": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "ErrorCachingMinTTL": {
+                    "type": "number"
+                },
+                "ErrorCode": {
+                    "type": "number"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponsePagePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ErrorCode"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HTTPPort": {
+                    "type": "number"
+                },
+                "HTTPSPort": {
+                    "type": "number"
+                },
+                "OriginKeepaliveTimeout": {
+                    "type": "number"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginReadTimeout": {
+                    "type": "number"
+                },
+                "OriginSSLProtocols": {
                     "items": {
                         "type": "string"
                     },
@@ -31179,295 +33712,531 @@
                 }
             },
             "required": [
-                "Items"
+                "OriginProtocolPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
+        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Items"
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy": {
+        "AWS::CloudFront::Distribution.DistributionConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContentSecurityPolicy": {
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CNAMEs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CacheBehaviors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CacheBehavior"
+                    },
+                    "type": "array"
+                },
+                "Comment": {
                     "type": "string"
                 },
-                "Override": {
+                "ContinuousDeploymentPolicyId": {
+                    "type": "string"
+                },
+                "CustomErrorResponses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomErrorResponse"
+                    },
+                    "type": "array"
+                },
+                "CustomOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyCustomOrigin"
+                },
+                "DefaultCacheBehavior": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.DefaultCacheBehavior"
+                },
+                "DefaultRootObject": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "HttpVersion": {
+                    "type": "string"
+                },
+                "IPV6Enabled": {
+                    "type": "boolean"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Logging"
+                },
+                "OriginGroups": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroups"
+                },
+                "Origins": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.Origin"
+                    },
+                    "type": "array"
+                },
+                "PriceClass": {
+                    "type": "string"
+                },
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Restrictions"
+                },
+                "S3Origin": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.LegacyS3Origin"
+                },
+                "Staging": {
                     "type": "boolean"
+                },
+                "ViewerCertificate": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
+                },
+                "WebACLId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ContentSecurityPolicy",
-                "Override"
+                "DefaultCacheBehavior",
+                "Enabled"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
+        "AWS::CloudFront::Distribution.ForwardedValues": {
             "additionalProperties": false,
             "properties": {
-                "Override": {
+                "Cookies": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryString": {
                     "type": "boolean"
+                },
+                "QueryStringCacheKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Override"
+                "QueryString"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
+        "AWS::CloudFront::Distribution.FunctionAssociation": {
             "additionalProperties": false,
             "properties": {
-                "AccessControlAllowCredentials": {
-                    "type": "boolean"
+                "EventType": {
+                    "type": "string"
                 },
-                "AccessControlAllowHeaders": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
+                "FunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.GeoRestriction": {
+            "additionalProperties": false,
+            "properties": {
+                "Locations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "AccessControlAllowMethods": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
+                "RestrictionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RestrictionType"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LambdaFunctionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "EventType": {
+                    "type": "string"
                 },
-                "AccessControlAllowOrigins": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
+                "IncludeBody": {
+                    "type": "boolean"
                 },
-                "AccessControlExposeHeaders": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
+                "LambdaFunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LegacyCustomOrigin": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
                 },
-                "AccessControlMaxAgeSec": {
+                "HTTPPort": {
                     "type": "number"
                 },
-                "OriginOverride": {
-                    "type": "boolean"
+                "HTTPSPort": {
+                    "type": "number"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "AccessControlAllowCredentials",
-                "AccessControlAllowHeaders",
-                "AccessControlAllowMethods",
-                "AccessControlAllowOrigins",
-                "OriginOverride"
+                "DNSName",
+                "OriginProtocolPolicy",
+                "OriginSSLProtocols"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
+        "AWS::CloudFront::Distribution.LegacyS3Origin": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "DNSName": {
                     "type": "string"
                 },
-                "Override": {
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "IncludeCookies": {
                     "type": "boolean"
                 },
-                "Value": {
+                "Prefix": {
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Override",
-                "Value"
+                "Bucket"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig": {
+        "AWS::CloudFront::Distribution.Origin": {
             "additionalProperties": false,
             "properties": {
-                "Items": {
+                "ConnectionAttempts": {
+                    "type": "number"
+                },
+                "ConnectionTimeout": {
+                    "type": "number"
+                },
+                "CustomOriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "OriginAccessControlId": {
+                    "type": "string"
+                },
+                "OriginCustomHeaders": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeader"
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginCustomHeader"
                     },
                     "type": "array"
+                },
+                "OriginPath": {
+                    "type": "string"
+                },
+                "OriginShield": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginShield"
+                },
+                "S3OriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.S3OriginConfig"
                 }
             },
             "required": [
-                "Items"
+                "DomainName",
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
+        "AWS::CloudFront::Distribution.OriginCustomHeader": {
             "additionalProperties": false,
             "properties": {
-                "FrameOption": {
+                "HeaderName": {
                     "type": "string"
                 },
-                "Override": {
-                    "type": "boolean"
+                "HeaderValue": {
+                    "type": "string"
                 }
             },
             "required": [
-                "FrameOption",
-                "Override"
+                "HeaderName",
+                "HeaderValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
+        "AWS::CloudFront::Distribution.OriginGroup": {
             "additionalProperties": false,
             "properties": {
-                "Override": {
-                    "type": "boolean"
+                "FailoverCriteria": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
                 },
-                "ReferrerPolicy": {
+                "Id": {
                     "type": "string"
+                },
+                "Members": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMembers"
                 }
             },
             "required": [
-                "Override",
-                "ReferrerPolicy"
+                "FailoverCriteria",
+                "Id",
+                "Members"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader": {
+        "AWS::CloudFront::Distribution.OriginGroupFailoverCriteria": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "StatusCodes": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.StatusCodes"
+                }
+            },
+            "required": [
+                "StatusCodes"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "OriginId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Header"
+                "OriginId"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig": {
+        "AWS::CloudFront::Distribution.OriginGroupMembers": {
             "additionalProperties": false,
             "properties": {
                 "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader"
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupMember"
                     },
                     "type": "array"
+                },
+                "Quantity": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Items"
+                "Items",
+                "Quantity"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+        "AWS::CloudFront::Distribution.OriginGroups": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
-                    "type": "string"
-                },
-                "CorsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
-                },
-                "CustomHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "RemoveHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig"
-                },
-                "SecurityHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                "Items": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroup"
+                    },
+                    "type": "array"
                 },
-                "ServerTimingHeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig"
+                "Quantity": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Name"
+                "Quantity"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig": {
+        "AWS::CloudFront::Distribution.OriginShield": {
             "additionalProperties": false,
             "properties": {
-                "ContentSecurityPolicy": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy"
-                },
-                "ContentTypeOptions": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions"
-                },
-                "FrameOptions": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.FrameOptions"
-                },
-                "ReferrerPolicy": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy"
-                },
-                "StrictTransportSecurity": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "XSSProtection": {
-                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.XSSProtection"
+                "OriginShieldRegion": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig": {
+        "AWS::CloudFront::Distribution.Restrictions": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "SamplingRate": {
-                    "type": "number"
+                "GeoRestriction": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.GeoRestriction"
                 }
             },
             "required": [
-                "Enabled"
+                "GeoRestriction"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity": {
+        "AWS::CloudFront::Distribution.S3OriginConfig": {
             "additionalProperties": false,
             "properties": {
-                "AccessControlMaxAgeSec": {
-                    "type": "number"
-                },
-                "IncludeSubdomains": {
-                    "type": "boolean"
-                },
-                "Override": {
-                    "type": "boolean"
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.StatusCodes": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
                 },
-                "Preload": {
-                    "type": "boolean"
+                "Quantity": {
+                    "type": "number"
                 }
             },
             "required": [
-                "AccessControlMaxAgeSec",
-                "Override"
+                "Items",
+                "Quantity"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ResponseHeadersPolicy.XSSProtection": {
+        "AWS::CloudFront::Distribution.ViewerCertificate": {
             "additionalProperties": false,
             "properties": {
-                "ModeBlock": {
-                    "type": "boolean"
+                "AcmCertificateArn": {
+                    "type": "string"
                 },
-                "Override": {
+                "CloudFrontDefaultCertificate": {
                     "type": "boolean"
                 },
-                "Protection": {
-                    "type": "boolean"
+                "IamCertificateId": {
+                    "type": "string"
                 },
-                "ReportUri": {
+                "MinimumProtocolVersion": {
+                    "type": "string"
+                },
+                "SslSupportMethod": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Override",
-                "Protection"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution": {
+        "AWS::CloudFront::Function": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31502,25 +34271,32 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "StreamingDistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
+                        "AutoPublish": {
+                            "type": "boolean"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "FunctionCode": {
+                            "type": "string"
+                        },
+                        "FunctionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        },
+                        "FunctionMetadata": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionMetadata"
+                        },
+                        "Name": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "StreamingDistributionConfig",
-                        "Tags"
+                        "FunctionCode",
+                        "FunctionConfig",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::StreamingDistribution"
+                        "AWS::CloudFront::Function"
                     ],
                     "type": "string"
                 },
@@ -31539,97 +34315,50 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution.Logging": {
+        "AWS::CloudFront::Function.FunctionConfig": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "Comment": {
                     "type": "string"
                 },
-                "Enabled": {
-                    "type": "boolean"
+                "KeyValueStoreAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Function.KeyValueStoreAssociation"
+                    },
+                    "type": "array"
                 },
-                "Prefix": {
+                "Runtime": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "Enabled",
-                "Prefix"
+                "Comment",
+                "Runtime"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution.S3Origin": {
+        "AWS::CloudFront::Function.FunctionMetadata": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "OriginAccessIdentity": {
+                "FunctionARN": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DomainName",
-                "OriginAccessIdentity"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig": {
+        "AWS::CloudFront::Function.KeyValueStoreAssociation": {
             "additionalProperties": false,
             "properties": {
-                "Aliases": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Comment": {
-                    "type": "string"
-                },
-                "Enabled": {
-                    "type": "boolean"
-                },
-                "Logging": {
-                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.Logging"
-                },
-                "PriceClass": {
+                "KeyValueStoreARN": {
                     "type": "string"
-                },
-                "S3Origin": {
-                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.S3Origin"
-                },
-                "TrustedSigners": {
-                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.TrustedSigners"
-                }
-            },
-            "required": [
-                "Comment",
-                "Enabled",
-                "S3Origin",
-                "TrustedSigners"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::StreamingDistribution.TrustedSigners": {
-            "additionalProperties": false,
-            "properties": {
-                "AwsAccountNumbers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Enabled": {
-                    "type": "boolean"
                 }
             },
             "required": [
-                "Enabled"
+                "KeyValueStoreARN"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Channel": {
+        "AWS::CloudFront::KeyGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31664,30 +34393,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Channel.Destination"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Source": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "KeyGroupConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
                         }
                     },
+                    "required": [
+                        "KeyGroupConfig"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::Channel"
+                        "AWS::CloudFront::KeyGroup"
                     ],
                     "type": "string"
                 },
@@ -31701,27 +34418,34 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Channel.Destination": {
+        "AWS::CloudFront::KeyGroup.KeyGroupConfig": {
             "additionalProperties": false,
             "properties": {
-                "Location": {
+                "Comment": {
                     "type": "string"
                 },
-                "Type": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 }
             },
             "required": [
-                "Location",
-                "Type"
+                "Items",
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::EventDataStore": {
+        "AWS::CloudFront::KeyValueStore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31756,63 +34480,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdvancedEventSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedEventSelector"
-                            },
-                            "type": "array"
-                        },
-                        "BillingMode": {
-                            "type": "string"
-                        },
-                        "FederationEnabled": {
-                            "type": "boolean"
-                        },
-                        "FederationRoleArn": {
-                            "type": "string"
-                        },
-                        "IngestionEnabled": {
-                            "type": "boolean"
-                        },
-                        "InsightSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.InsightSelector"
-                            },
-                            "type": "array"
-                        },
-                        "InsightsDestination": {
-                            "type": "string"
-                        },
-                        "KmsKeyId": {
+                        "Comment": {
                             "type": "string"
                         },
-                        "MultiRegionEnabled": {
-                            "type": "boolean"
+                        "ImportSource": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyValueStore.ImportSource"
                         },
                         "Name": {
                             "type": "string"
-                        },
-                        "OrganizationEnabled": {
-                            "type": "boolean"
-                        },
-                        "RetentionPeriod": {
-                            "type": "number"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "TerminationProtectionEnabled": {
-                            "type": "boolean"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::EventDataStore"
+                        "AWS::CloudFront::KeyValueStore"
                     ],
                     "type": "string"
                 },
@@ -31826,86 +34511,28 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::EventDataStore.AdvancedEventSelector": {
+        "AWS::CloudFront::KeyValueStore.ImportSource": {
             "additionalProperties": false,
             "properties": {
-                "FieldSelectors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedFieldSelector"
-                    },
-                    "type": "array"
-                },
-                "Name": {
+                "SourceArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "FieldSelectors"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudTrail::EventDataStore.AdvancedFieldSelector": {
-            "additionalProperties": false,
-            "properties": {
-                "EndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Equals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 },
-                "Field": {
+                "SourceType": {
                     "type": "string"
-                },
-                "NotEndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "NotEquals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "NotStartsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "StartsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
             "required": [
-                "Field"
+                "SourceArn",
+                "SourceType"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::EventDataStore.InsightSelector": {
-            "additionalProperties": false,
-            "properties": {
-                "InsightType": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudTrail::ResourcePolicy": {
+        "AWS::CloudFront::MonitoringSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -31940,22 +34567,22 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ResourceArn": {
+                        "DistributionId": {
                             "type": "string"
                         },
-                        "ResourcePolicy": {
-                            "type": "object"
+                        "MonitoringSubscription": {
+                            "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.MonitoringSubscription"
                         }
                     },
                     "required": [
-                        "ResourceArn",
-                        "ResourcePolicy"
+                        "DistributionId",
+                        "MonitoringSubscription"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::ResourcePolicy"
+                        "AWS::CloudFront::MonitoringSubscription"
                     ],
                     "type": "string"
                 },
@@ -31974,16 +34601,37 @@
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail": {
+        "AWS::CloudFront::MonitoringSubscription.MonitoringSubscription": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
+                "RealtimeMetricsSubscriptionConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::MonitoringSubscription.RealtimeMetricsSubscriptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RealtimeMetricsSubscriptionStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RealtimeMetricsSubscriptionStatus"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginAccessControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
                         "Snapshot"
                     ],
                     "type": "string"
@@ -32009,76 +34657,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdvancedEventSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedEventSelector"
-                            },
-                            "type": "array"
-                        },
-                        "CloudWatchLogsLogGroupArn": {
-                            "type": "string"
-                        },
-                        "CloudWatchLogsRoleArn": {
-                            "type": "string"
-                        },
-                        "EnableLogFileValidation": {
-                            "type": "boolean"
-                        },
-                        "EventSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Trail.EventSelector"
-                            },
-                            "type": "array"
-                        },
-                        "IncludeGlobalServiceEvents": {
-                            "type": "boolean"
-                        },
-                        "InsightSelectors": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudTrail::Trail.InsightSelector"
-                            },
-                            "type": "array"
-                        },
-                        "IsLogging": {
-                            "type": "boolean"
-                        },
-                        "IsMultiRegionTrail": {
-                            "type": "boolean"
-                        },
-                        "IsOrganizationTrail": {
-                            "type": "boolean"
-                        },
-                        "KMSKeyId": {
-                            "type": "string"
-                        },
-                        "S3BucketName": {
-                            "type": "string"
-                        },
-                        "S3KeyPrefix": {
-                            "type": "string"
-                        },
-                        "SnsTopicName": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "TrailName": {
-                            "type": "string"
+                        "OriginAccessControlConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig"
                         }
                     },
                     "required": [
-                        "IsLogging",
-                        "S3BucketName"
+                        "OriginAccessControlConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudTrail::Trail"
+                        "AWS::CloudFront::OriginAccessControl"
                     ],
                     "type": "string"
                 },
@@ -32097,79 +34687,105 @@
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.AdvancedEventSelector": {
+        "AWS::CloudFront::OriginAccessControl.OriginAccessControlConfig": {
             "additionalProperties": false,
             "properties": {
-                "FieldSelectors": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedFieldSelector"
-                    },
-                    "type": "array"
+                "Description": {
+                    "type": "string"
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OriginAccessControlOriginType": {
+                    "type": "string"
+                },
+                "SigningBehavior": {
+                    "type": "string"
+                },
+                "SigningProtocol": {
+                    "type": "string"
                 }
             },
             "required": [
-                "FieldSelectors"
+                "Name",
+                "OriginAccessControlOriginType",
+                "SigningBehavior",
+                "SigningProtocol"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.AdvancedFieldSelector": {
+        "AWS::CloudFront::OriginRequestPolicy": {
             "additionalProperties": false,
             "properties": {
-                "EndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Equals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Condition": {
+                    "type": "string"
                 },
-                "Field": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 },
-                "NotEndsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "NotEquals": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "NotStartsWith": {
-                    "items": {
-                        "type": "string"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "OriginRequestPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "OriginRequestPolicyConfig"
+                    ],
+                    "type": "object"
                 },
-                "StartsWith": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::OriginRequestPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "Field"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.DataResource": {
+        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "CookieBehavior": {
                     "type": "string"
                 },
-                "Values": {
+                "Cookies": {
                     "items": {
                         "type": "string"
                     },
@@ -32177,44 +34793,74 @@
                 }
             },
             "required": [
-                "Type"
+                "CookieBehavior"
             ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.EventSelector": {
+        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
             "additionalProperties": false,
             "properties": {
-                "DataResources": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudTrail::Trail.DataResource"
-                    },
-                    "type": "array"
+                "HeaderBehavior": {
+                    "type": "string"
                 },
-                "ExcludeManagementEventSources": {
+                "Headers": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
                 },
-                "IncludeManagementEvents": {
-                    "type": "boolean"
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
                 },
-                "ReadWriteType": {
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.HeadersConfig"
+                },
+                "Name": {
                     "type": "string"
+                },
+                "QueryStringsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig"
                 }
             },
+            "required": [
+                "CookiesConfig",
+                "HeadersConfig",
+                "Name",
+                "QueryStringsConfig"
+            ],
             "type": "object"
         },
-        "AWS::CloudTrail::Trail.InsightSelector": {
+        "AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
             "additionalProperties": false,
             "properties": {
-                "InsightType": {
+                "QueryStringBehavior": {
                     "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "QueryStringBehavior"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm": {
+        "AWS::CloudFront::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32249,100 +34895,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionsEnabled": {
-                            "type": "boolean"
-                        },
-                        "AlarmActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AlarmDescription": {
-                            "type": "string"
-                        },
-                        "AlarmName": {
-                            "type": "string"
-                        },
-                        "ComparisonOperator": {
-                            "type": "string"
-                        },
-                        "DatapointsToAlarm": {
-                            "type": "number"
-                        },
-                        "Dimensions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
-                            },
-                            "type": "array"
-                        },
-                        "EvaluateLowSampleCountPercentile": {
-                            "type": "string"
-                        },
-                        "EvaluationPeriods": {
-                            "type": "number"
-                        },
-                        "ExtendedStatistic": {
-                            "type": "string"
-                        },
-                        "InsufficientDataActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "MetricName": {
-                            "type": "string"
-                        },
-                        "Metrics": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricDataQuery"
-                            },
-                            "type": "array"
-                        },
-                        "Namespace": {
-                            "type": "string"
-                        },
-                        "OKActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Period": {
-                            "type": "number"
-                        },
-                        "Statistic": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdMetricId": {
-                            "type": "string"
-                        },
-                        "TreatMissingData": {
-                            "type": "string"
-                        },
-                        "Unit": {
-                            "type": "string"
+                        "PublicKeyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
                         }
                     },
                     "required": [
-                        "ComparisonOperator",
-                        "EvaluationPeriods"
+                        "PublicKeyConfig"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::Alarm"
+                        "AWS::CloudFront::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -32361,94 +34925,145 @@
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.Dimension": {
+        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "CallerReference": {
                     "type": "string"
                 },
-                "Value": {
+                "Comment": {
+                    "type": "string"
+                },
+                "EncodedKey": {
+                    "type": "string"
+                },
+                "Name": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name",
-                "Value"
+                "CallerReference",
+                "EncodedKey",
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.Metric": {
+        "AWS::CloudFront::RealtimeLogConfig": {
             "additionalProperties": false,
             "properties": {
-                "Dimensions": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
+                "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": {
+                        "EndPoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.EndPoint"
+                            },
+                            "type": "array"
+                        },
+                        "Fields": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SamplingRate": {
+                            "type": "number"
+                        }
                     },
-                    "type": "array"
+                    "required": [
+                        "EndPoints",
+                        "Fields",
+                        "Name",
+                        "SamplingRate"
+                    ],
+                    "type": "object"
                 },
-                "MetricName": {
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::RealtimeLogConfig"
+                    ],
                     "type": "string"
                 },
-                "Namespace": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
+            "required": [
+                "Type",
+                "Properties"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.MetricDataQuery": {
+        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
-                    "type": "string"
-                },
-                "Expression": {
-                    "type": "string"
-                },
-                "Id": {
-                    "type": "string"
+                "KinesisStreamConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
                 },
-                "Label": {
+                "StreamType": {
                     "type": "string"
-                },
-                "MetricStat": {
-                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricStat"
-                },
-                "Period": {
-                    "type": "number"
-                },
-                "ReturnData": {
-                    "type": "boolean"
                 }
             },
             "required": [
-                "Id"
+                "KinesisStreamConfig",
+                "StreamType"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Alarm.MetricStat": {
+        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
             "additionalProperties": false,
             "properties": {
-                "Metric": {
-                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.Metric"
-                },
-                "Period": {
-                    "type": "number"
-                },
-                "Stat": {
+                "RoleArn": {
                     "type": "string"
                 },
-                "Unit": {
+                "StreamArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "Metric",
-                "Period",
-                "Stat"
+                "RoleArn",
+                "StreamArn"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector": {
+        "AWS::CloudFront::ResponseHeadersPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32483,39 +35098,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
-                        },
-                        "Dimensions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
-                            },
-                            "type": "array"
-                        },
-                        "MetricCharacteristics": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricCharacteristics"
-                        },
-                        "MetricMathAnomalyDetector": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
-                        },
-                        "MetricName": {
-                            "type": "string"
-                        },
-                        "Namespace": {
-                            "type": "string"
-                        },
-                        "SingleMetricAnomalyDetector": {
-                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
-                        },
-                        "Stat": {
-                            "type": "string"
+                        "ResponseHeadersPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
                         }
                     },
+                    "required": [
+                        "ResponseHeadersPolicyConfig"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::AnomalyDetector"
+                        "AWS::CloudFront::ResponseHeadersPolicy"
                     ],
                     "type": "string"
                 },
@@ -32529,183 +35123,341 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Configuration": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
             "additionalProperties": false,
             "properties": {
-                "ExcludedTimeRanges": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Range"
+                        "type": "string"
                     },
                     "type": "array"
-                },
-                "MetricTimeZone": {
-                    "type": "string"
                 }
             },
+            "required": [
+                "Items"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Dimension": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name",
-                "Value"
+                "Items"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Metric": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
             "additionalProperties": false,
             "properties": {
-                "Dimensions": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                        "type": "string"
                     },
                     "type": "array"
-                },
-                "MetricName": {
-                    "type": "string"
-                },
-                "Namespace": {
-                    "type": "string"
                 }
             },
             "required": [
-                "MetricName",
-                "Namespace"
+                "Items"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricCharacteristics": {
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
             "additionalProperties": false,
             "properties": {
-                "PeriodicSpikes": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentSecurityPolicy": {
+                    "type": "string"
+                },
+                "Override": {
                     "type": "boolean"
                 }
             },
+            "required": [
+                "ContentSecurityPolicy",
+                "Override"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+        "AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
             "additionalProperties": false,
-            "properties": {},
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Override"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
-                    "type": "string"
+                "AccessControlAllowCredentials": {
+                    "type": "boolean"
                 },
-                "Expression": {
-                    "type": "string"
+                "AccessControlAllowHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
                 },
-                "Id": {
-                    "type": "string"
+                "AccessControlAllowMethods": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
                 },
-                "Label": {
-                    "type": "string"
+                "AccessControlAllowOrigins": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
                 },
-                "MetricStat": {
-                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                "AccessControlExposeHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
                 },
-                "Period": {
+                "AccessControlMaxAgeSec": {
                     "type": "number"
                 },
-                "ReturnData": {
+                "OriginOverride": {
                     "type": "boolean"
                 }
             },
             "required": [
-                "Id"
+                "AccessControlAllowCredentials",
+                "AccessControlAllowHeaders",
+                "AccessControlAllowMethods",
+                "AccessControlAllowOrigins",
+                "OriginOverride"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector": {
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
             "additionalProperties": false,
             "properties": {
-                "MetricDataQueries": {
+                "Header": {
+                    "type": "string"
+                },
+                "Override": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Override",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricDataQuery"
+                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeader"
                     },
                     "type": "array"
                 }
             },
+            "required": [
+                "Items"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.MetricStat": {
+        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
             "additionalProperties": false,
             "properties": {
-                "Metric": {
-                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Metric"
-                },
-                "Period": {
-                    "type": "number"
-                },
-                "Stat": {
+                "FrameOption": {
                     "type": "string"
                 },
-                "Unit": {
-                    "type": "string"
+                "Override": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Metric",
-                "Period",
-                "Stat"
+                "FrameOption",
+                "Override"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.Range": {
+        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
-                    "type": "string"
+                "Override": {
+                    "type": "boolean"
                 },
-                "StartTime": {
+                "ReferrerPolicy": {
                     "type": "string"
                 }
             },
             "required": [
-                "EndTime",
-                "StartTime"
+                "Override",
+                "ReferrerPolicy"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
+        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "Header": {
                     "type": "string"
-                },
-                "Dimensions": {
+                }
+            },
+            "required": [
+                "Header"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                        "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeader"
                     },
                     "type": "array"
-                },
-                "MetricName": {
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
                     "type": "string"
                 },
-                "Namespace": {
+                "CorsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
+                },
+                "CustomHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Stat": {
+                "RemoveHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.RemoveHeadersConfig"
+                },
+                "SecurityHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                },
+                "ServerTimingHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentSecurityPolicy": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy"
+                },
+                "ContentTypeOptions": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions"
+                },
+                "FrameOptions": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.FrameOptions"
+                },
+                "ReferrerPolicy": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy"
+                },
+                "StrictTransportSecurity": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity"
+                },
+                "XSSProtection": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.XSSProtection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ServerTimingHeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SamplingRate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlMaxAgeSec": {
+                    "type": "number"
+                },
+                "IncludeSubdomains": {
+                    "type": "boolean"
+                },
+                "Override": {
+                    "type": "boolean"
+                },
+                "Preload": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AccessControlMaxAgeSec",
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.XSSProtection": {
+            "additionalProperties": false,
+            "properties": {
+                "ModeBlock": {
+                    "type": "boolean"
+                },
+                "Override": {
+                    "type": "boolean"
+                },
+                "Protection": {
+                    "type": "boolean"
+                },
+                "ReportUri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Override",
+                "Protection"
+            ],
             "type": "object"
         },
-        "AWS::CloudWatch::CompositeAlarm": {
+        "AWS::CloudFront::StreamingDistribution": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32740,44 +35492,8 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ActionsSuppressor": {
-                            "type": "string"
-                        },
-                        "ActionsSuppressorExtensionPeriod": {
-                            "type": "number"
-                        },
-                        "ActionsSuppressorWaitPeriod": {
-                            "type": "number"
-                        },
-                        "AlarmActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AlarmDescription": {
-                            "type": "string"
-                        },
-                        "AlarmName": {
-                            "type": "string"
-                        },
-                        "AlarmRule": {
-                            "type": "string"
-                        },
-                        "InsufficientDataActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "OKActions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "StreamingDistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
                         },
                         "Tags": {
                             "items": {
@@ -32787,13 +35503,14 @@
                         }
                     },
                     "required": [
-                        "AlarmRule"
+                        "StreamingDistributionConfig",
+                        "Tags"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::CompositeAlarm"
+                        "AWS::CloudFront::StreamingDistribution"
                     ],
                     "type": "string"
                 },
@@ -32812,7 +35529,97 @@
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::Dashboard": {
+        "AWS::CloudFront::StreamingDistribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Enabled",
+                "Prefix"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::StreamingDistribution.S3Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName",
+                "OriginAccessIdentity"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.Logging"
+                },
+                "PriceClass": {
+                    "type": "string"
+                },
+                "S3Origin": {
+                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.S3Origin"
+                },
+                "TrustedSigners": {
+                    "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.TrustedSigners"
+                }
+            },
+            "required": [
+                "Comment",
+                "Enabled",
+                "S3Origin",
+                "TrustedSigners"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::StreamingDistribution.TrustedSigners": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccountNumbers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::Channel": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32847,21 +35654,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DashboardBody": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::Channel.Destination"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "DashboardName": {
+                        "Source": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
-                    "required": [
-                        "DashboardBody"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::Dashboard"
+                        "AWS::CloudTrail::Channel"
                     ],
                     "type": "string"
                 },
@@ -32875,12 +35691,27 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::InsightRule": {
+        "AWS::CloudTrail::Channel.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Location",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32915,29 +35746,206 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "RuleBody": {
-                            "type": "string"
+                        "AdvancedEventSelectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedEventSelector"
+                            },
+                            "type": "array"
                         },
-                        "RuleName": {
+                        "BillingMode": {
                             "type": "string"
                         },
-                        "RuleState": {
+                        "FederationEnabled": {
+                            "type": "boolean"
+                        },
+                        "FederationRoleArn": {
+                            "type": "string"
+                        },
+                        "IngestionEnabled": {
+                            "type": "boolean"
+                        },
+                        "InsightSelectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.InsightSelector"
+                            },
+                            "type": "array"
+                        },
+                        "InsightsDestination": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiRegionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Name": {
                             "type": "string"
                         },
+                        "OrganizationEnabled": {
+                            "type": "boolean"
+                        },
+                        "RetentionPeriod": {
+                            "type": "number"
+                        },
                         "Tags": {
-                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule.Tags"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TerminationProtectionEnabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudTrail::EventDataStore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore.AdvancedEventSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudTrail::EventDataStore.AdvancedFieldSelector"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldSelectors"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore.AdvancedFieldSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "EndsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Equals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "NotEndsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotEquals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotStartsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StartsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Field"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::EventDataStore.InsightSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudTrail::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "RuleBody",
-                        "RuleName",
-                        "RuleState"
+                        "ResourceArn",
+                        "ResourcePolicy"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::InsightRule"
+                        "AWS::CloudTrail::ResourcePolicy"
                     ],
                     "type": "string"
                 },
@@ -32956,12 +35964,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::InsightRule.Tags": {
-            "additionalProperties": false,
-            "properties": {},
-            "type": "object"
-        },
-        "AWS::CloudWatch::MetricStream": {
+        "AWS::CloudTrail::Trail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -32996,56 +35999,76 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExcludeFilters": {
+                        "AdvancedEventSelectors": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                                "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedEventSelector"
                             },
                             "type": "array"
                         },
-                        "FirehoseArn": {
+                        "CloudWatchLogsLogGroupArn": {
                             "type": "string"
                         },
-                        "IncludeFilters": {
+                        "CloudWatchLogsRoleArn": {
+                            "type": "string"
+                        },
+                        "EnableLogFileValidation": {
+                            "type": "boolean"
+                        },
+                        "EventSelectors": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                                "$ref": "#/definitions/AWS::CloudTrail::Trail.EventSelector"
                             },
                             "type": "array"
                         },
-                        "IncludeLinkedAccountsMetrics": {
+                        "IncludeGlobalServiceEvents": {
                             "type": "boolean"
                         },
-                        "Name": {
+                        "InsightSelectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudTrail::Trail.InsightSelector"
+                            },
+                            "type": "array"
+                        },
+                        "IsLogging": {
+                            "type": "boolean"
+                        },
+                        "IsMultiRegionTrail": {
+                            "type": "boolean"
+                        },
+                        "IsOrganizationTrail": {
+                            "type": "boolean"
+                        },
+                        "KMSKeyId": {
                             "type": "string"
                         },
-                        "OutputFormat": {
+                        "S3BucketName": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "S3KeyPrefix": {
                             "type": "string"
                         },
-                        "StatisticsConfigurations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration"
-                            },
-                            "type": "array"
+                        "SnsTopicName": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TrailName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "FirehoseArn",
-                        "OutputFormat",
-                        "RoleArn"
+                        "IsLogging",
+                        "S3BucketName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudWatch::MetricStream"
+                        "AWS::CloudTrail::Trail"
                     ],
                     "type": "string"
                 },
@@ -33064,63 +36087,124 @@
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
+        "AWS::CloudTrail::Trail.AdvancedEventSelector": {
             "additionalProperties": false,
             "properties": {
-                "MetricNames": {
+                "FieldSelectors": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CloudTrail::Trail.AdvancedFieldSelector"
                     },
                     "type": "array"
                 },
-                "Namespace": {
+                "Name": {
                     "type": "string"
                 }
             },
             "required": [
-                "Namespace"
+                "FieldSelectors"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration": {
+        "AWS::CloudTrail::Trail.AdvancedFieldSelector": {
             "additionalProperties": false,
             "properties": {
-                "AdditionalStatistics": {
+                "EndsWith": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "IncludeMetrics": {
+                "Equals": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "NotEndsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotEquals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotStartsWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StartsWith": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "AdditionalStatistics",
-                "IncludeMetrics"
+                "Field"
             ],
             "type": "object"
         },
-        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric": {
+        "AWS::CloudTrail::Trail.DataResource": {
             "additionalProperties": false,
             "properties": {
-                "MetricName": {
+                "Type": {
                     "type": "string"
                 },
-                "Namespace": {
-                    "type": "string"
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "MetricName",
-                "Namespace"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::Domain": {
+        "AWS::CloudTrail::Trail.EventSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "DataResources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudTrail::Trail.DataResource"
+                    },
+                    "type": "array"
+                },
+                "ExcludeManagementEventSources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeManagementEvents": {
+                    "type": "boolean"
+                },
+                "ReadWriteType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudTrail::Trail.InsightSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33155,30 +36239,100 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DomainName": {
+                        "ActionsEnabled": {
+                            "type": "boolean"
+                        },
+                        "AlarmActions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AlarmDescription": {
                             "type": "string"
                         },
-                        "EncryptionKey": {
+                        "AlarmName": {
                             "type": "string"
                         },
-                        "PermissionsPolicyDocument": {
-                            "type": "object"
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
+                            },
+                            "type": "array"
+                        },
+                        "EvaluateLowSampleCountPercentile": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "ExtendedStatistic": {
+                            "type": "string"
+                        },
+                        "InsufficientDataActions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Metrics": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricDataQuery"
+                            },
+                            "type": "array"
+                        },
+                        "Namespace": {
+                            "type": "string"
+                        },
+                        "OKActions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdMetricId": {
+                            "type": "string"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        },
+                        "Unit": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "ComparisonOperator",
+                        "EvaluationPeriods"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeArtifact::Domain"
+                        "AWS::CloudWatch::Alarm"
                     ],
                     "type": "string"
                 },
@@ -33197,7 +36351,94 @@
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup": {
+        "AWS::CloudWatch::Alarm.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::Alarm.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Alarm.MetricStat": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::CloudWatch::Alarm.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33232,40 +36473,39 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContactInfo": {
-                            "type": "string"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
                         },
-                        "Description": {
-                            "type": "string"
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                            },
+                            "type": "array"
                         },
-                        "DomainName": {
+                        "MetricCharacteristics": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricCharacteristics"
+                        },
+                        "MetricMathAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
+                        },
+                        "MetricName": {
                             "type": "string"
                         },
-                        "DomainOwner": {
+                        "Namespace": {
                             "type": "string"
                         },
-                        "OriginConfiguration": {
-                            "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.OriginConfiguration"
+                        "SingleMetricAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
                         },
-                        "Pattern": {
+                        "Stat": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
-                    "required": [
-                        "DomainName",
-                        "Pattern"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeArtifact::PackageGroup"
+                        "AWS::CloudWatch::AnomalyDetector"
                     ],
                     "type": "string"
                 },
@@ -33279,57 +36519,183 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup.OriginConfiguration": {
+        "AWS::CloudWatch::AnomalyDetector.Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Restrictions": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.Restrictions"
+                "ExcludedTimeRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Range"
+                    },
+                    "type": "array"
+                },
+                "MetricTimeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Restrictions"
+                "Name",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup.RestrictionType": {
+        "AWS::CloudWatch::AnomalyDetector.Metric": {
             "additionalProperties": false,
             "properties": {
-                "Repositories": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
                     },
                     "type": "array"
                 },
-                "RestrictionMode": {
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
                     "type": "string"
                 }
             },
             "required": [
-                "RestrictionMode"
+                "MetricName",
+                "Namespace"
             ],
             "type": "object"
         },
-        "AWS::CodeArtifact::PackageGroup.Restrictions": {
+        "AWS::CloudWatch::AnomalyDetector.MetricCharacteristics": {
             "additionalProperties": false,
             "properties": {
-                "ExternalUpstream": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                "PeriodicSpikes": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
                 },
-                "InternalUpstream": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                "Expression": {
+                    "type": "string"
                 },
-                "Publish": {
-                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
+            "required": [
+                "Id"
+            ],
             "type": "object"
         },
-        "AWS::CodeArtifact::Repository": {
+        "AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricStat": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Range": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndTime",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Stat": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudWatch::CompositeAlarm": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33364,49 +36730,60 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "ActionsEnabled": {
+                            "type": "boolean"
                         },
-                        "DomainName": {
+                        "ActionsSuppressor": {
                             "type": "string"
                         },
-                        "DomainOwner": {
-                            "type": "string"
+                        "ActionsSuppressorExtensionPeriod": {
+                            "type": "number"
                         },
-                        "ExternalConnections": {
+                        "ActionsSuppressorWaitPeriod": {
+                            "type": "number"
+                        },
+                        "AlarmActions": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "PermissionsPolicyDocument": {
-                            "type": "object"
+                        "AlarmDescription": {
+                            "type": "string"
                         },
-                        "RepositoryName": {
+                        "AlarmName": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "AlarmRule": {
+                            "type": "string"
+                        },
+                        "InsufficientDataActions": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "Upstreams": {
+                        "OKActions": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DomainName",
-                        "RepositoryName"
+                        "AlarmRule"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeArtifact::Repository"
+                        "AWS::CloudWatch::CompositeAlarm"
                     ],
                     "type": "string"
                 },
@@ -33425,7 +36802,7 @@
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Fleet": {
+        "AWS::CloudWatch::Dashboard": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33460,30 +36837,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BaseCapacity": {
-                            "type": "number"
-                        },
-                        "ComputeType": {
-                            "type": "string"
-                        },
-                        "EnvironmentType": {
+                        "DashboardBody": {
                             "type": "string"
                         },
-                        "Name": {
+                        "DashboardName": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DashboardBody"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeBuild::Fleet"
+                        "AWS::CloudWatch::Dashboard"
                     ],
                     "type": "string"
                 },
@@ -33497,11 +36865,12 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project": {
+        "AWS::CloudWatch::InsightRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -33536,105 +36905,137 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Artifacts": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
-                        },
-                        "BadgeEnabled": {
-                            "type": "boolean"
-                        },
-                        "BuildBatchConfig": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectBuildBatchConfig"
-                        },
-                        "Cache": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectCache"
-                        },
-                        "ConcurrentBuildLimit": {
-                            "type": "number"
-                        },
-                        "Description": {
+                        "RuleBody": {
                             "type": "string"
                         },
-                        "EncryptionKey": {
+                        "RuleName": {
                             "type": "string"
                         },
-                        "Environment": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.Environment"
-                        },
-                        "FileSystemLocations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectFileSystemLocation"
-                            },
-                            "type": "array"
-                        },
-                        "LogsConfig": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.LogsConfig"
-                        },
-                        "Name": {
+                        "RuleState": {
                             "type": "string"
                         },
-                        "QueuedTimeoutInMinutes": {
-                            "type": "number"
-                        },
-                        "ResourceAccessRole": {
+                        "Tags": {
+                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule.Tags"
+                        }
+                    },
+                    "required": [
+                        "RuleBody",
+                        "RuleName",
+                        "RuleState"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::InsightRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::InsightRule.Tags": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::MetricStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SecondaryArtifacts": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
-                        },
-                        "SecondarySourceVersions": {
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludeFilters": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectSourceVersion"
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
                             },
                             "type": "array"
                         },
-                        "SecondarySources": {
+                        "FirehoseArn": {
+                            "type": "string"
+                        },
+                        "IncludeFilters": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
                             },
                             "type": "array"
                         },
-                        "ServiceRole": {
+                        "IncludeLinkedAccountsMetrics": {
+                            "type": "boolean"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                        "OutputFormat": {
+                            "type": "string"
                         },
-                        "SourceVersion": {
+                        "RoleArn": {
                             "type": "string"
                         },
+                        "StatisticsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TimeoutInMinutes": {
-                            "type": "number"
-                        },
-                        "Triggers": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectTriggers"
-                        },
-                        "Visibility": {
-                            "type": "string"
-                        },
-                        "VpcConfig": {
-                            "$ref": "#/definitions/AWS::CodeBuild::Project.VpcConfig"
                         }
                     },
                     "required": [
-                        "Artifacts",
-                        "Environment",
-                        "ServiceRole",
-                        "Source"
+                        "FirehoseArn",
+                        "OutputFormat",
+                        "RoleArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CodeBuild::Project"
+                        "AWS::CloudWatch::MetricStream"
                     ],
                     "type": "string"
                 },
@@ -33653,91 +37054,713 @@
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.Artifacts": {
+        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
             "additionalProperties": false,
             "properties": {
-                "ArtifactIdentifier": {
-                    "type": "string"
-                },
-                "EncryptionDisabled": {
-                    "type": "boolean"
-                },
-                "Location": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "NamespaceType": {
-                    "type": "string"
-                },
-                "OverrideArtifactName": {
-                    "type": "boolean"
-                },
-                "Packaging": {
-                    "type": "string"
-                },
-                "Path": {
-                    "type": "string"
+                "MetricNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Type": {
+                "Namespace": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Namespace"
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.BatchRestrictions": {
+        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ComputeTypesAllowed": {
+                "AdditionalStatistics": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "MaximumBuildsAllowed": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CodeBuild::Project.BuildStatusConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Context": {
-                    "type": "string"
-                },
-                "TargetUrl": {
-                    "type": "string"
+                "IncludeMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "AdditionalStatistics",
+                "IncludeMetrics"
+            ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.CloudWatchLogsConfig": {
+        "AWS::CloudWatch::MetricStream.MetricStreamStatisticsMetric": {
             "additionalProperties": false,
             "properties": {
-                "GroupName": {
-                    "type": "string"
-                },
-                "Status": {
+                "MetricName": {
                     "type": "string"
                 },
-                "StreamName": {
+                "Namespace": {
                     "type": "string"
                 }
             },
             "required": [
-                "Status"
+                "MetricName",
+                "Namespace"
             ],
             "type": "object"
         },
-        "AWS::CodeBuild::Project.Environment": {
+        "AWS::CodeArtifact::Domain": {
             "additionalProperties": false,
             "properties": {
-                "Certificate": {
+                "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": {
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "PermissionsPolicyDocument": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeArtifact::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup": {
+            "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": {
+                        "ContactInfo": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainOwner": {
+                            "type": "string"
+                        },
+                        "OriginConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.OriginConfiguration"
+                        },
+                        "Pattern": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "Pattern"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeArtifact::PackageGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup.OriginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.Restrictions"
+                }
+            },
+            "required": [
+                "Restrictions"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup.RestrictionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Repositories": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RestrictionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RestrictionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::PackageGroup.Restrictions": {
+            "additionalProperties": false,
+            "properties": {
+                "ExternalUpstream": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                },
+                "InternalUpstream": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                },
+                "Publish": {
+                    "$ref": "#/definitions/AWS::CodeArtifact::PackageGroup.RestrictionType"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeArtifact::Repository": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainOwner": {
+                            "type": "string"
+                        },
+                        "ExternalConnections": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionsPolicyDocument": {
+                            "type": "object"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Upstreams": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "RepositoryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeArtifact::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Fleet": {
+            "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": {
+                        "BaseCapacity": {
+                            "type": "number"
+                        },
+                        "ComputeType": {
+                            "type": "string"
+                        },
+                        "EnvironmentType": {
+                            "type": "string"
+                        },
+                        "FleetServiceRole": {
+                            "type": "string"
+                        },
+                        "FleetVpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Fleet.VpcConfig"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OverflowBehavior": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project": {
+            "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": {
+                        "Artifacts": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
+                        },
+                        "BadgeEnabled": {
+                            "type": "boolean"
+                        },
+                        "BuildBatchConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectBuildBatchConfig"
+                        },
+                        "Cache": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectCache"
+                        },
+                        "ConcurrentBuildLimit": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.Environment"
+                        },
+                        "FileSystemLocations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectFileSystemLocation"
+                            },
+                            "type": "array"
+                        },
+                        "LogsConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.LogsConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueuedTimeoutInMinutes": {
+                            "type": "number"
+                        },
+                        "ResourceAccessRole": {
+                            "type": "string"
+                        },
+                        "SecondaryArtifacts": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.Artifacts"
+                            },
+                            "type": "array"
+                        },
+                        "SecondarySourceVersions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectSourceVersion"
+                            },
+                            "type": "array"
+                        },
+                        "SecondarySources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.Source"
+                        },
+                        "SourceVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        },
+                        "Triggers": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.ProjectTriggers"
+                        },
+                        "Visibility": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "Artifacts",
+                        "Environment",
+                        "ServiceRole",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Artifacts": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactIdentifier": {
+                    "type": "string"
+                },
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NamespaceType": {
+                    "type": "string"
+                },
+                "OverrideArtifactName": {
+                    "type": "boolean"
+                },
+                "Packaging": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.BatchRestrictions": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeTypesAllowed": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaximumBuildsAllowed": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.BuildStatusConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Context": {
+                    "type": "string"
+                },
+                "TargetUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.CloudWatchLogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupName": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
                     "type": "string"
                 },
                 "ComputeType": {
@@ -33928,6 +37951,9 @@
                     },
                     "type": "array"
                 },
+                "ScopeConfiguration": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.ScopeConfiguration"
+                },
                 "Webhook": {
                     "type": "boolean"
                 }
@@ -33968,6 +37994,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Project.ScopeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
         "AWS::CodeBuild::Project.Source": {
             "additionalProperties": false,
             "properties": {
@@ -35813,6 +39851,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.BeforeEntryConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35829,6 +39879,21 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Result": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleDeclaration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.EncryptionKey": {
             "additionalProperties": false,
             "properties": {
@@ -35845,6 +39910,21 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.FailureConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                },
+                "Result": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.GitBranchFilterCriteria": {
             "additionalProperties": false,
             "properties": {
@@ -35995,6 +40075,51 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.RuleDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RuleTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleTypeId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.RuleTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.StageDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36004,6 +40129,9 @@
                     },
                     "type": "array"
                 },
+                "BeforeEntry": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BeforeEntryConditions"
+                },
                 "Blockers": {
                     "items": {
                         "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
@@ -36012,6 +40140,12 @@
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.FailureConditions"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.SuccessConditions"
                 }
             },
             "required": [
@@ -36036,6 +40170,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.SuccessConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.VariableDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36726,6 +40872,12 @@
                         "IdentityPoolName": {
                             "type": "string"
                         },
+                        "IdentityPoolTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "OpenIdConnectProviderARNs": {
                             "items": {
                                 "type": "string"
@@ -37118,6 +41270,15 @@
             },
             "type": "object"
         },
+        "AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::LogDeliveryConfiguration.LogConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -37127,8 +41288,23 @@
                 "EventSource": {
                     "type": "string"
                 },
+                "FirehoseConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration"
+                },
                 "LogLevel": {
                     "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.S3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::LogDeliveryConfiguration.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -37192,6 +41368,12 @@
                         "DeviceConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
                         },
+                        "EmailAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "EmailAuthenticationSubject": {
+                            "type": "string"
+                        },
                         "EmailConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
                         },
@@ -37311,6 +41493,15 @@
             },
             "type": "object"
         },
+        "AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomAuthMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::UserPool.CustomEmailSender": {
             "additionalProperties": false,
             "properties": {
@@ -37449,6 +41640,9 @@
                 "MinimumLength": {
                     "type": "number"
                 },
+                "PasswordHistorySize": {
+                    "type": "number"
+                },
                 "RequireLowercase": {
                     "type": "boolean"
                 },
@@ -37572,6 +41766,9 @@
         "AWS::Cognito::UserPool.UserPoolAddOns": {
             "additionalProperties": false,
             "properties": {
+                "AdvancedSecurityAdditionalFlows": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows"
+                },
                 "AdvancedSecurityMode": {
                     "type": "string"
                 }
@@ -40324,6 +44521,97 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::AgentStatus": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayOrder": {
+                            "type": "number"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResetOrderNumber": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "State"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::AgentStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::ApprovedOrigin": {
             "additionalProperties": false,
             "properties": {
@@ -42210,6 +46498,12 @@
                     },
                     "type": "array"
                 },
+                "SubmitAutoEvaluationActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Connect::Rule.SubmitAutoEvaluationAction"
+                    },
+                    "type": "array"
+                },
                 "TaskActions": {
                     "items": {
                         "$ref": "#/definitions/AWS::Connect::Rule.TaskAction"
@@ -42369,6 +46663,18 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::Rule.SubmitAutoEvaluationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EvaluationFormArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EvaluationFormArn"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::Rule.TaskAction": {
             "additionalProperties": false,
             "properties": {
@@ -43151,7 +47457,7 @@
             ],
             "type": "object"
         },
-        "AWS::Connect::View": {
+        "AWS::Connect::UserHierarchyStructure": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -43186,42 +47492,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Actions": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
                         "InstanceArn": {
                             "type": "string"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Template": {
-                            "type": "object"
+                        "UserHierarchyStructure": {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.UserHierarchyStructure"
                         }
                     },
                     "required": [
-                        "Actions",
-                        "InstanceArn",
-                        "Name",
-                        "Template"
+                        "InstanceArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Connect::View"
+                        "AWS::Connect::UserHierarchyStructure"
                     ],
                     "type": "string"
                 },
@@ -43240,7 +47525,207 @@
             ],
             "type": "object"
         },
-        "AWS::Connect::ViewVersion": {
+        "AWS::Connect::UserHierarchyStructure.LevelFive": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFour": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelOne": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelThree": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelTwo": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.UserHierarchyStructure": {
+            "additionalProperties": false,
+            "properties": {
+                "LevelFive": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFive"
+                },
+                "LevelFour": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFour"
+                },
+                "LevelOne": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelOne"
+                },
+                "LevelThree": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelThree"
+                },
+                "LevelTwo": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelTwo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Connect::View": {
+            "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": {
+                        "Actions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Template": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "InstanceArn",
+                        "Name",
+                        "Template"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::View"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ViewVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -47326,9 +51811,6 @@
                         "ComputeConfig": {
                             "$ref": "#/definitions/AWS::DMS::ReplicationConfig.ComputeConfig"
                         },
-                        "ReplicationConfigArn": {
-                            "type": "string"
-                        },
                         "ReplicationConfigIdentifier": {
                             "type": "string"
                         },
@@ -47360,6 +51842,14 @@
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ComputeConfig",
+                        "ReplicationConfigIdentifier",
+                        "ReplicationType",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -47378,7 +51868,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -47477,6 +51968,9 @@
                         "MultiAZ": {
                             "type": "boolean"
                         },
+                        "NetworkType": {
+                            "type": "string"
+                        },
                         "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
@@ -51744,9 +56238,18 @@
                         "DomainIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentAccountIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentAccountRegion": {
+                            "type": "string"
+                        },
                         "EnvironmentProfileIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentRoleArn": {
+                            "type": "string"
+                        },
                         "GlossaryTerms": {
                             "items": {
                                 "type": "string"
@@ -51768,7 +56271,6 @@
                     },
                     "required": [
                         "DomainIdentifier",
-                        "EnvironmentProfileIdentifier",
                         "Name",
                         "ProjectIdentifier"
                     ],
@@ -51807,6 +56309,95 @@
             },
             "type": "object"
         },
+        "AWS::DataZone::EnvironmentActions": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::EnvironmentActions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::EnvironmentBlueprintConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -52019,6 +56610,78 @@
             },
             "type": "object"
         },
+        "AWS::DataZone::GroupProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "GroupIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::GroupProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::DataZone::Project": {
             "additionalProperties": false,
             "properties": {
@@ -52097,6 +56760,95 @@
             ],
             "type": "object"
         },
+        "AWS::DataZone::ProjectMembership": {
+            "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": {
+                        "Designation": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Member": {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership.Member"
+                        },
+                        "ProjectIdentifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Designation",
+                        "DomainIdentifier",
+                        "Member",
+                        "ProjectIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::ProjectMembership"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::ProjectMembership.Member": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupIdentifier": {
+                    "type": "string"
+                },
+                "UserIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::SubscriptionTarget": {
             "additionalProperties": false,
             "properties": {
@@ -52218,6 +56970,117 @@
             ],
             "type": "object"
         },
+        "AWS::DataZone::UserProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserIdentifier": {
+                            "type": "string"
+                        },
+                        "UserType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "UserIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.IamUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.SsoUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.UserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.IamUserProfileDetails"
+                },
+                "Sso": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.SsoUserProfileDetails"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Deadline::Farm": {
             "additionalProperties": false,
             "properties": {
@@ -52261,6 +57124,12 @@
                         },
                         "KmsKeyArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -52344,11 +57213,18 @@
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
                         "Configuration",
                         "DisplayName",
+                        "FarmId",
                         "MaxWorkerCount",
                         "RoleArn"
                     ],
@@ -52711,6 +57587,12 @@
                             },
                             "type": "array"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "VpcId": {
                             "type": "string"
                         }
@@ -52778,27 +57660,94 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Family": {
+                        "LicenseEndpointId": {
                             "type": "string"
                         },
-                        "LicenseEndpointId": {
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Deadline::MeteredProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Deadline::Monitor": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "Port": {
-                            "type": "number"
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
                         },
-                        "ProductId": {
+                        "IdentityCenterInstanceArn": {
                             "type": "string"
                         },
-                        "Vendor": {
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Subdomain": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DisplayName",
+                        "IdentityCenterInstanceArn",
+                        "RoleArn",
+                        "Subdomain"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Deadline::MeteredProduct"
+                        "AWS::Deadline::Monitor"
                     ],
                     "type": "string"
                 },
@@ -52812,7 +57761,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -52883,10 +57833,17 @@
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DisplayName"
+                        "DisplayName",
+                        "FarmId"
                     ],
                     "type": "object"
                 },
@@ -53184,6 +58141,7 @@
                     },
                     "required": [
                         "DisplayName",
+                        "FarmId",
                         "OsFamily"
                     ],
                     "type": "object"
@@ -54603,6 +59561,9 @@
                         "TimeToLiveSpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
                         },
+                        "WriteOnDemandThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                        },
                         "WriteProvisionedThroughputSettings": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                         }
@@ -54701,6 +59662,9 @@
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
                 },
+                "WriteOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                },
                 "WriteProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                 }
@@ -54790,6 +59754,15 @@
             },
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54811,6 +59784,9 @@
                 "IndexName": {
                     "type": "string"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 }
@@ -54853,6 +59829,9 @@
                 "PointInTimeRecoverySpecification": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 },
@@ -54970,6 +59949,15 @@
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -55053,6 +60041,9 @@
                             },
                             "type": "array"
                         },
+                        "OnDemandThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                        },
                         "PointInTimeRecoverySpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
                         },
@@ -55168,6 +60159,9 @@
                     },
                     "type": "array"
                 },
+                "OnDemandThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                },
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
                 },
@@ -55267,6 +60261,18 @@
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::Table.OnDemandThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                },
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
             "additionalProperties": false,
             "properties": {
@@ -56224,6 +61230,9 @@
                         "BgpAsn": {
                             "type": "number"
                         },
+                        "BgpAsnExtended": {
+                            "type": "number"
+                        },
                         "CertificateArn": {
                             "type": "string"
                         },
@@ -57490,6 +62499,9 @@
                         "Description": {
                             "type": "string"
                         },
+                        "EnablePrivateGua": {
+                            "type": "boolean"
+                        },
                         "OperatingRegions": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
@@ -58570,6 +63582,18 @@
             ],
             "type": "object"
         },
+        "AWS::EC2::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::Instance.Volume": {
             "additionalProperties": false,
             "properties": {
@@ -63246,12 +68270,6 @@
                         "Ipv6CidrBlock": {
                             "type": "string"
                         },
-                        "Ipv6CidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Ipv6IpamPoolId": {
                             "type": "string"
                         },
@@ -63665,6 +68683,12 @@
                         "SourcePortRange": {
                             "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "TrafficDirection": {
                             "type": "string"
                         },
@@ -63949,6 +68973,9 @@
                         "PropagationDefaultRouteTableId": {
                             "type": "string"
                         },
+                        "SecurityGroupReferencingSupport": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -64626,6 +69653,7 @@
                         }
                     },
                     "required": [
+                        "DestinationCidrBlock",
                         "TransitGatewayRouteTableId"
                     ],
                     "type": "object"
@@ -64968,6 +69996,9 @@
                 },
                 "Ipv6Support": {
                     "type": "string"
+                },
+                "SecurityGroupReferencingSupport": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -65729,6 +70760,24 @@
                         "CustomerGatewayId": {
                             "type": "string"
                         },
+                        "EnableAcceleration": {
+                            "type": "boolean"
+                        },
+                        "LocalIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "LocalIpv6NetworkCidr": {
+                            "type": "string"
+                        },
+                        "OutsideIpAddressType": {
+                            "type": "string"
+                        },
+                        "RemoteIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "RemoteIpv6NetworkCidr": {
+                            "type": "string"
+                        },
                         "StaticRoutesOnly": {
                             "type": "boolean"
                         },
@@ -65741,6 +70790,12 @@
                         "TransitGatewayId": {
                             "type": "string"
                         },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TunnelInsideIpVersion": {
+                            "type": "string"
+                        },
                         "Type": {
                             "type": "string"
                         },
@@ -67282,6 +72337,9 @@
                             },
                             "type": "array"
                         },
+                        "CustomRoleArn": {
+                            "type": "string"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -67576,6 +72634,9 @@
             "properties": {
                 "ExecuteCommandConfiguration": {
                     "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                },
+                "ManagedStorageConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ManagedStorageConfiguration"
                 }
             },
             "type": "object"
@@ -67628,6 +72689,18 @@
             },
             "type": "object"
         },
+        "AWS::ECS::Cluster.ManagedStorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FargateEphemeralStorageKmsKeyId": {
+                    "type": "string"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::Cluster.ServiceConnectDefaults": {
             "additionalProperties": false,
             "properties": {
@@ -68644,6 +73717,9 @@
                     },
                     "type": "array"
                 },
+                "RestartPolicy": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RestartPolicy"
+                },
                 "Secrets": {
                     "items": {
                         "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
@@ -69080,6 +74156,24 @@
             ],
             "type": "object"
         },
+        "AWS::ECS::TaskDefinition.RestartPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnoredExitCodes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "RestartAttemptPeriod": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::TaskDefinition.RuntimePlatform": {
             "additionalProperties": false,
             "properties": {
@@ -69980,6 +75074,12 @@
                         "ConfigurationValues": {
                             "type": "string"
                         },
+                        "PodIdentityAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Addon.PodIdentityAssociation"
+                            },
+                            "type": "array"
+                        },
                         "PreserveOnDelete": {
                             "type": "boolean"
                         },
@@ -70023,6 +75123,22 @@
             ],
             "type": "object"
         },
+        "AWS::EKS::Addon.PodIdentityAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceAccount"
+            ],
+            "type": "object"
+        },
         "AWS::EKS::Cluster": {
             "additionalProperties": false,
             "properties": {
@@ -70061,6 +75177,9 @@
                         "AccessConfig": {
                             "$ref": "#/definitions/AWS::EKS::Cluster.AccessConfig"
                         },
+                        "BootstrapSelfManagedAddons": {
+                            "type": "boolean"
+                        },
                         "EncryptionConfig": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
@@ -70091,8 +75210,14 @@
                             },
                             "type": "array"
                         },
+                        "UpgradePolicy": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.UpgradePolicy"
+                        },
                         "Version": {
                             "type": "string"
+                        },
+                        "ZonalShiftConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ZonalShiftConfig"
                         }
                     },
                     "required": [
@@ -70267,6 +75392,24 @@
             ],
             "type": "object"
         },
+        "AWS::EKS::Cluster.UpgradePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "SupportType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ZonalShiftConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EKS::FargateProfile": {
             "additionalProperties": false,
             "properties": {
@@ -71219,6 +76362,9 @@
                 "Name": {
                     "type": "string"
                 },
+                "ResizeSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetResizingSpecifications"
+                },
                 "TargetOnDemandCapacity": {
                     "type": "number"
                 },
@@ -71240,6 +76386,18 @@
             },
             "type": "object"
         },
+        "AWS::EMR::Cluster.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.InstanceGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71304,6 +76462,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71453,11 +76614,29 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71465,6 +76644,21 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.PlacementGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71616,6 +76810,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.StepConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71710,6 +76916,9 @@
                         "Name": {
                             "type": "string"
                         },
+                        "ResizeSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications"
+                        },
                         "TargetOnDemandCapacity": {
                             "type": "number"
                         },
@@ -71810,6 +77019,18 @@
             },
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71834,6 +77055,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71843,11 +77067,29 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71855,6 +77097,21 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -71877,6 +77134,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -72863,6 +78132,9 @@
                             },
                             "type": "array"
                         },
+                        "InteractiveConfiguration": {
+                            "$ref": "#/definitions/AWS::EMRServerless::Application.InteractiveConfiguration"
+                        },
                         "MaximumCapacity": {
                             "$ref": "#/definitions/AWS::EMRServerless::Application.MaximumAllowedResources"
                         },
@@ -73043,6 +78315,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMRServerless::Application.InteractiveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LivyEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "StudioEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMRServerless::Application.LogTypeMapKeyValuePair": {
             "additionalProperties": false,
             "properties": {
@@ -73147,6 +78431,9 @@
                 "Disk": {
                     "type": "string"
                 },
+                "DiskType": {
+                    "type": "string"
+                },
                 "Memory": {
                     "type": "string"
                 }
@@ -75328,6 +80615,12 @@
                             },
                             "type": "array"
                         },
+                        "ListenerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute"
+                            },
+                            "type": "array"
+                        },
                         "LoadBalancerArn": {
                             "type": "string"
                         },
@@ -75542,6 +80835,18 @@
             },
             "type": "object"
         },
+        "AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ElasticLoadBalancingV2::Listener.MutualAuthentication": {
             "additionalProperties": false,
             "properties": {
@@ -77005,6 +82310,31 @@
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "RecordMatchingModel": {
+                    "type": "string"
+                },
+                "RuleDefinitionType": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "RecordMatchingModel"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdMappingWorkflow.IdMappingTechniques": {
             "additionalProperties": false,
             "properties": {
@@ -77013,6 +82343,9 @@
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.ProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties"
                 }
             },
             "type": "object"
@@ -77086,6 +82419,25 @@
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdNamespace": {
             "additionalProperties": false,
             "properties": {
@@ -77187,6 +82539,9 @@
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties"
                 }
             },
             "required": [
@@ -77230,213 +82585,34 @@
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow": {
+        "AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "AttributeMatchingModel": {
                     "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
-                            },
-                            "type": "array"
-                        },
-                        "OutputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
-                            },
-                            "type": "array"
-                        },
-                        "ResolutionTechniques": {
-                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "WorkflowName": {
-                            "type": "string"
-                        }
+                "RecordMatchingModels": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "InputSourceConfig",
-                        "OutputSourceConfig",
-                        "ResolutionTechniques",
-                        "RoleArn",
-                        "WorkflowName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::EntityResolution::MatchingWorkflow"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "InputSourceARN": {
-                    "type": "string"
-                },
-                "SchemaArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputSourceARN",
-                "SchemaArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "IntermediateS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
-            "additionalProperties": false,
-            "properties": {
-                "Hashed": {
-                    "type": "boolean"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "KMSArn": {
-                    "type": "string"
+                    "type": "array"
                 },
-                "Output": {
+                "RuleDefinitionTypes": {
                     "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "OutputS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Output",
-                "OutputS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateSourceConfiguration": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
-                },
-                "ProviderConfiguration": {
-                    "additionalProperties": true,
-                    "patternProperties": {
-                        "^[a-zA-Z0-9]+$": {
-                            "type": "string"
-                        }
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.Rule"
                     },
-                    "type": "object"
-                },
-                "ProviderServiceArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ProviderServiceArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
-            "additionalProperties": false,
-            "properties": {
-                "ProviderProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
-                },
-                "ResolutionType": {
-                    "type": "string"
-                },
-                "RuleBasedProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                    "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+        "AWS::EntityResolution::IdNamespace.Rule": {
             "additionalProperties": false,
             "properties": {
                 "MatchingKeys": {
@@ -77455,26 +82631,269 @@
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "AttributeMatchingModel": {
-                    "type": "string"
-                },
-                "Rules": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AttributeMatchingModel",
-                "Rules"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::PolicyStatement": {
+        "AWS::EntityResolution::MatchingWorkflow": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IncrementalRunConfig": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig"
+                        },
+                        "InputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
+                            },
+                            "type": "array"
+                        },
+                        "OutputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
+                            },
+                            "type": "array"
+                        },
+                        "ResolutionTechniques": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputSourceConfig",
+                        "OutputSourceConfig",
+                        "ResolutionTechniques",
+                        "RoleArn",
+                        "WorkflowName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EntityResolution::MatchingWorkflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IncrementalRunType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IncrementalRunType"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "InputSourceARN": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSourceARN",
+                "SchemaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Hashed": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "KMSArn": {
+                    "type": "string"
+                },
+                "Output": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                    },
+                    "type": "array"
+                },
+                "OutputS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Output",
+                "OutputS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateSourceConfiguration": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
+                },
+                "ProviderConfiguration": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ProviderServiceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderServiceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
+                },
+                "ResolutionType": {
+                    "type": "string"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "MatchPurpose": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::PolicyStatement": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -77651,6 +83070,9 @@
                 "GroupName": {
                     "type": "string"
                 },
+                "Hashed": {
+                    "type": "boolean"
+                },
                 "MatchKey": {
                     "type": "string"
                 },
@@ -78575,9 +83997,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Events::EventBus.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
                         "EventSourceName": {
                             "type": "string"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -78617,6 +84048,15 @@
             ],
             "type": "object"
         },
+        "AWS::Events::EventBus.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Events::EventBusPolicy": {
             "additionalProperties": false,
             "properties": {
@@ -80592,80 +86032,95 @@
             },
             "type": "object"
         },
-        "AWS::FMS::Policy.NetworkFirewallPolicy": {
+        "AWS::FMS::Policy.IcmpTypeCode": {
             "additionalProperties": false,
             "properties": {
-                "FirewallDeploymentModel": {
-                    "type": "string"
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
                 }
             },
             "required": [
-                "FirewallDeploymentModel"
+                "Code",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyOption": {
+        "AWS::FMS::Policy.NetworkAclCommonPolicy": {
             "additionalProperties": false,
             "properties": {
-                "NetworkFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
-                },
-                "ThirdPartyFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                "NetworkAclEntrySet": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntrySet"
                 }
             },
+            "required": [
+                "NetworkAclEntrySet"
+            ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyTag": {
+        "AWS::FMS::Policy.NetworkAclEntry": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CidrBlock": {
                     "type": "string"
                 },
-                "Value": {
+                "Egress": {
+                    "type": "boolean"
+                },
+                "IcmpTypeCode": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.IcmpTypeCode"
+                },
+                "Ipv6CidrBlock": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::FMS::Policy.ResourceTag": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PortRange"
+                },
+                "Protocol": {
                     "type": "string"
                 },
-                "Value": {
+                "RuleAction": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key"
+                "Egress",
+                "Protocol",
+                "RuleAction"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.SecurityServicePolicyData": {
+        "AWS::FMS::Policy.NetworkAclEntrySet": {
             "additionalProperties": false,
             "properties": {
-                "ManagedServiceData": {
-                    "type": "string"
+                "FirstEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 },
-                "PolicyOption": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                "ForceRemediateForFirstEntries": {
+                    "type": "boolean"
                 },
-                "Type": {
-                    "type": "string"
+                "ForceRemediateForLastEntries": {
+                    "type": "boolean"
+                },
+                "LastEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Type"
+                "ForceRemediateForFirstEntries",
+                "ForceRemediateForLastEntries"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
+        "AWS::FMS::Policy.NetworkFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
                 "FirewallDeploymentModel": {
@@ -80677,224 +86132,316 @@
             ],
             "type": "object"
         },
-        "AWS::FMS::ResourceSet": {
+        "AWS::FMS::Policy.PolicyOption": {
             "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"
-                        }
-                    ]
+                "NetworkAclCommonPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclCommonPolicy"
                 },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ResourceTypeList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Resources": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "ResourceTypeList"
-                    ],
-                    "type": "object"
+                "NetworkFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::FMS::ResourceSet"
-                    ],
+                "ThirdPartyFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation": {
+        "AWS::FMS::Policy.PortRange": {
             "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": {
-                        "BatchImportMetaDataOnCreate": {
-                            "type": "boolean"
-                        },
-                        "DataRepositoryPath": {
-                            "type": "string"
-                        },
-                        "FileSystemId": {
-                            "type": "string"
-                        },
-                        "FileSystemPath": {
-                            "type": "string"
-                        },
-                        "ImportedFileChunkSize": {
-                            "type": "number"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DataRepositoryPath",
-                        "FileSystemId",
-                        "FileSystemPath"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::FSx::DataRepositoryAssociation"
-                    ],
-                    "type": "string"
+                "From": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "To": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "From",
+                "To"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+        "AWS::FMS::Policy.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+        "AWS::FMS::Policy.SecurityServicePolicyData": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ManagedServiceData": {
+                    "type": "string"
+                },
+                "PolicyOption": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.S3": {
+        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
-                "AutoExportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
-                },
-                "AutoImportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                "FirewallDeploymentModel": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "FirewallDeploymentModel"
+            ],
             "type": "object"
         },
-        "AWS::FSx::FileSystem": {
+        "AWS::FMS::ResourceSet": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ResourceTypeList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation": {
+            "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": {
+                        "BatchImportMetaDataOnCreate": {
+                            "type": "boolean"
+                        },
+                        "DataRepositoryPath": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "FileSystemPath": {
+                            "type": "string"
+                        },
+                        "ImportedFileChunkSize": {
+                            "type": "number"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataRepositoryPath",
+                        "FileSystemId",
+                        "FileSystemPath"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::DataRepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoExportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
+                },
+                "AutoImportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -81084,6 +86631,9 @@
                 "ImportedFileChunkSize": {
                     "type": "number"
                 },
+                "MetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.MetadataConfiguration"
+                },
                 "PerUnitStorageThroughput": {
                     "type": "number"
                 },
@@ -81093,6 +86643,18 @@
             },
             "type": "object"
         },
+        "AWS::FSx::FileSystem.MetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::FSx::FileSystem.NfsExports": {
             "additionalProperties": false,
             "properties": {
@@ -84871,6 +90433,9 @@
         "AWS::GlobalAccelerator::CrossAccountAttachment.Resource": {
             "additionalProperties": false,
             "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
                 "EndpointId": {
                     "type": "string"
                 },
@@ -84878,9 +90443,6 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "EndpointId"
-            ],
             "type": "object"
         },
         "AWS::GlobalAccelerator::EndpointGroup": {
@@ -85588,6 +91150,12 @@
                 "ConnectionName": {
                     "type": "string"
                 },
+                "EnableAdditionalMetadata": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "Exclusions": {
                     "items": {
                         "type": "string"
@@ -86038,6 +91606,9 @@
                         },
                         "DatabaseInput": {
                             "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -86320,9 +91891,18 @@
                         "GlueVersion": {
                             "type": "string"
                         },
+                        "JobMode": {
+                            "type": "string"
+                        },
+                        "JobRunQueuingEnabled": {
+                            "type": "boolean"
+                        },
                         "LogUri": {
                             "type": "string"
                         },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
                         "MaxCapacity": {
                             "type": "number"
                         },
@@ -87948,7 +93528,7 @@
             },
             "type": "object"
         },
-        "AWS::Glue::Workflow": {
+        "AWS::Glue::UsageProfile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -87983,27 +93563,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultRunProperties": {
-                            "type": "object"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ProfileConfiguration"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "MaxConcurrentRuns": {
-                            "type": "number"
-                        },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "type": "object"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Glue::Workflow"
+                        "AWS::Glue::UsageProfile"
                     ],
                     "type": "string"
                 },
@@ -88017,11 +93600,130 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Grafana::Workspace": {
+        "AWS::Glue::UsageProfile.ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::UsageProfile.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JobConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SessionConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "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": {
+                        "DefaultRunProperties": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentRuns": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Grafana::Workspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91792,7 +97494,9 @@
                         }
                     },
                     "required": [
-                        "FindingCriteria"
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name"
                     ],
                     "type": "object"
                 },
@@ -92002,7 +97706,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Master": {
+        "AWS::GuardDuty::MalwareProtectionPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92037,25 +97741,31 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DetectorId": {
-                            "type": "string"
+                        "Actions": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNActions"
                         },
-                        "InvitationId": {
-                            "type": "string"
+                        "ProtectedResource": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource"
                         },
-                        "MasterId": {
+                        "Role": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.TagItem"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DetectorId",
-                        "MasterId"
+                        "ProtectedResource",
+                        "Role"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Master"
+                        "AWS::GuardDuty::MalwareProtectionPlan"
                     ],
                     "type": "string"
                 },
@@ -92074,7 +97784,80 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Member": {
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNActions": {
+            "additionalProperties": false,
+            "properties": {
+                "Tagging": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNTagging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.S3Bucket"
+                }
+            },
+            "required": [
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNTagging": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.S3Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "ObjectPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92112,30 +97895,22 @@
                         "DetectorId": {
                             "type": "string"
                         },
-                        "DisableEmailNotification": {
-                            "type": "boolean"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "MemberId": {
-                            "type": "string"
-                        },
-                        "Message": {
+                        "InvitationId": {
                             "type": "string"
                         },
-                        "Status": {
+                        "MasterId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Email"
+                        "DetectorId",
+                        "MasterId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Member"
+                        "AWS::GuardDuty::Master"
                     ],
                     "type": "string"
                 },
@@ -92154,7 +97929,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet": {
+        "AWS::GuardDuty::Member": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92189,37 +97964,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Activate": {
-                            "type": "boolean"
-                        },
                         "DetectorId": {
                             "type": "string"
                         },
-                        "Format": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
                             "type": "string"
                         },
-                        "Location": {
+                        "MemberId": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Message": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
-                            },
-                            "type": "array"
+                        "Status": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "Location"
+                        "Email"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::ThreatIntelSet"
+                        "AWS::GuardDuty::Member"
                     ],
                     "type": "string"
                 },
@@ -92238,23 +98009,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::HealthImaging::Datastore": {
+        "AWS::GuardDuty::ThreatIntelSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92289,27 +98044,37 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DatastoreName": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
                             },
-                            "type": "object"
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Format",
+                        "Location"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::HealthImaging::Datastore"
+                        "AWS::GuardDuty::ThreatIntelSet"
                     ],
                     "type": "string"
                 },
@@ -92323,11 +98088,101 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::HealthLake::FHIRDatastore": {
+        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthImaging::Datastore": {
+            "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": {
+                        "DatastoreName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthImaging::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92944,9 +98799,6 @@
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "ThumbprintList"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -92965,8 +98817,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -94142,7 +99993,7 @@
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration": {
+        "AWS::IVS::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94177,36 +100028,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DestinationConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
-                        },
                         "Name": {
                             "type": "string"
                         },
-                        "RecordingReconnectWindowSeconds": {
-                            "type": "number"
-                        },
-                        "RenditionConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        "PublicKeyMaterial": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ThumbnailConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
-                    "required": [
-                        "DestinationConfiguration"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::RecordingConfiguration"
+                        "AWS::IVS::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -94220,69 +100059,11 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RenditionSelection": {
-                    "type": "string"
-                },
-                "Renditions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "BucketName": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "BucketName"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RecordingMode": {
-                    "type": "string"
-                },
-                "Resolution": {
-                    "type": "string"
-                },
-                "Storage": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TargetIntervalSeconds": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::Stage": {
+        "AWS::IVS::RecordingConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94317,21 +100098,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "RecordingReconnectWindowSeconds": {
+                            "type": "number"
+                        },
+                        "RenditionConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "ThumbnailConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::Stage"
+                        "AWS::IVS::RecordingConfiguration"
                     ],
                     "type": "string"
                 },
@@ -94345,85 +100141,36 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RenditionSelection": {
                     "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": {
-                        "Name": {
-                            "type": "string"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "Renditions": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "S3"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::IVS::StorageConfiguration"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "BucketName": {
@@ -94435,7 +100182,202 @@
             ],
             "type": "object"
         },
-        "AWS::IVS::StreamKey": {
+        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordingMode": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                },
+                "Storage": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetIntervalSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::Stage": {
+            "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": {
+                        "AutoParticipantRecordingConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::Stage.AutoParticipantRecordingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Stage.AutoParticipantRecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MediaTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StorageConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StorageConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -96870,6 +102812,12 @@
                             "$ref": "#/definitions/AWS::InspectorV2::CisScanConfiguration.CisTargets"
                         }
                     },
+                    "required": [
+                        "ScanName",
+                        "Schedule",
+                        "SecurityLevel",
+                        "Targets"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -96888,7 +102836,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -98551,9 +104500,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ApplicationProtocol": {
+                            "type": "string"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
                         "AuthorizerConfig": {
                             "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
                         },
+                        "ClientCertificateConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.ClientCertificateConfig"
+                        },
                         "DomainConfigurationName": {
                             "type": "string"
                         },
@@ -98622,6 +104580,15 @@
             },
             "type": "object"
         },
+        "AWS::IoT::DomainConfiguration.ClientCertificateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientCertificateCallbackArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::IoT::DomainConfiguration.ServerCertificateConfig": {
             "additionalProperties": false,
             "properties": {
@@ -104077,6 +110044,12 @@
                             },
                             "type": "array"
                         },
+                        "SignalsToFetch": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchInformation"
+                            },
+                            "type": "array"
+                        },
                         "SpoolingMode": {
                             "type": "string"
                         },
@@ -104094,7 +110067,6 @@
                         }
                     },
                     "required": [
-                        "Action",
                         "CollectionScheme",
                         "Name",
                         "SignalCatalogArn",
@@ -104156,9 +110128,28 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                },
+                "TriggerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression",
+                "TriggerMode"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.DataDestinationConfig": {
             "additionalProperties": false,
             "properties": {
+                "MqttTopicConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.MqttTopicConfig"
+                },
                 "S3Config": {
                     "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.S3Config"
                 },
@@ -104168,6 +110159,22 @@
             },
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.MqttTopicConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "MqttTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "MqttTopicArn"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.S3Config": {
             "additionalProperties": false,
             "properties": {
@@ -104189,6 +110196,44 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.SignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig"
+                },
+                "TimeBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTFleetWise::Campaign.SignalFetchInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConditionLanguageVersion": {
+                    "type": "number"
+                },
+                "FullyQualifiedName": {
+                    "type": "string"
+                },
+                "SignalFetchConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchConfig"
+                }
+            },
+            "required": [
+                "Actions",
+                "FullyQualifiedName",
+                "SignalFetchConfig"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.SignalInformation": {
             "additionalProperties": false,
             "properties": {
@@ -104219,6 +110264,18 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionFrequencyMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutionFrequencyMs"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.TimestreamConfig": {
             "additionalProperties": false,
             "properties": {
@@ -111096,6 +117153,75 @@
             ],
             "type": "object"
         },
+        "AWS::Kinesis::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "ResourcePolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kinesis::Stream": {
             "additionalProperties": false,
             "properties": {
@@ -112010,6 +118136,9 @@
                 "ApplicationSnapshotConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
                 },
+                "ApplicationSystemRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration"
+                },
                 "EnvironmentProperties": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
                 },
@@ -112070,6 +118199,18 @@
             ],
             "type": "object"
         },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RollbackEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "RollbackEnabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
             "additionalProperties": false,
             "properties": {
@@ -113032,6 +119173,9 @@
                         "HttpEndpointDestinationConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
                         },
+                        "IcebergDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration"
+                        },
                         "KinesisStreamSourceConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
                         },
@@ -113243,6 +119387,15 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113321,6 +119474,31 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDatabaseName": {
+                    "type": "string"
+                },
+                "DestinationTableName": {
+                    "type": "string"
+                },
+                "S3ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "UniqueKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DestinationDatabaseName",
+                "DestinationTableName"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.DocumentIdOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113561,6 +119739,9 @@
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
@@ -113584,6 +119765,47 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "DestinationTableConfigurationList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration"
+                    },
+                    "type": "array"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "s3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CatalogConfiguration",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -113630,6 +119852,9 @@
                 "MSKClusterARN": {
                     "type": "string"
                 },
+                "ReadFromTimestamp": {
+                    "type": "string"
+                },
                 "TopicName": {
                     "type": "string"
                 }
@@ -113816,6 +120041,9 @@
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "Username": {
                     "type": "string"
                 }
@@ -113823,10 +120051,8 @@
             "required": [
                 "ClusterJDBCURL",
                 "CopyCommand",
-                "Password",
                 "RoleARN",
-                "S3Configuration",
-                "Username"
+                "S3Configuration"
             ],
             "type": "object"
         },
@@ -113906,6 +120132,24 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecretARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.Serializer": {
             "additionalProperties": false,
             "properties": {
@@ -113918,12 +120162,27 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.SnowflakeDestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "AccountUrl": {
                     "type": "string"
                 },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints"
+                },
                 "CloudWatchLoggingOptions": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
                 },
@@ -113963,6 +120222,9 @@
                 "Schema": {
                     "type": "string"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "SnowflakeRoleConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeRoleConfiguration"
                 },
@@ -113979,12 +120241,10 @@
             "required": [
                 "AccountUrl",
                 "Database",
-                "PrivateKey",
                 "RoleARN",
                 "S3Configuration",
                 "Schema",
-                "Table",
-                "User"
+                "Table"
             ],
             "type": "object"
         },
@@ -114065,12 +120325,14 @@
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
                 "HECEndpoint",
                 "HECEndpointType",
-                "HECToken",
                 "S3Configuration"
             ],
             "type": "object"
@@ -115439,9 +121701,6 @@
                     "type": "array"
                 }
             },
-            "required": [
-                "AdditionalVersionWeights"
-            ],
             "type": "object"
         },
         "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
@@ -115515,6 +121774,12 @@
                         },
                         "Description": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -115752,6 +122017,9 @@
                             },
                             "type": "array"
                         },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
                         "MaximumBatchingWindowInSeconds": {
                             "type": "number"
                         },
@@ -115791,6 +122059,12 @@
                         "StartingPositionTimestamp": {
                             "type": "number"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "Topics": {
                             "items": {
                                 "type": "string"
@@ -116033,6 +122307,9 @@
                         "PackageType": {
                             "type": "string"
                         },
+                        "RecursiveLoop": {
+                            "type": "string"
+                        },
                         "ReservedConcurrentExecutions": {
                             "type": "number"
                         },
@@ -116106,6 +122383,9 @@
                 "S3ObjectVersion": {
                     "type": "string"
                 },
+                "SourceKMSKeyArn": {
+                    "type": "string"
+                },
                 "ZipFile": {
                     "type": "string"
                 }
@@ -116699,6 +122979,9 @@
                         "FunctionName": {
                             "type": "string"
                         },
+                        "Policy": {
+                            "type": "object"
+                        },
                         "ProvisionedConcurrencyConfig": {
                             "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
                         },
@@ -116759,6 +123042,110 @@
             ],
             "type": "object"
         },
+        "AWS::LaunchWizard::Deployment": {
+            "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": {
+                        "DeploymentPatternName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Specifications": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LaunchWizard::Deployment.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "WorkloadName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeploymentPatternName",
+                        "Name",
+                        "Specifications",
+                        "WorkloadName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LaunchWizard::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LaunchWizard::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
         "AWS::Lex::Bot": {
             "additionalProperties": false,
             "properties": {
@@ -124264,6 +130651,15 @@
             },
             "type": "object"
         },
+        "AWS::MSK::Replicator.ReplicationTopicNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MSK::Replicator.TopicReplication": {
             "additionalProperties": false,
             "properties": {
@@ -124279,6 +130675,9 @@
                 "StartingPosition": {
                     "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationStartingPosition"
                 },
+                "TopicNameConfiguration": {
+                    "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationTopicNameConfiguration"
+                },
                 "TopicsToExclude": {
                     "items": {
                         "type": "string"
@@ -124594,9 +130993,15 @@
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
                         },
+                        "MaxWebservers": {
+                            "type": "number"
+                        },
                         "MaxWorkers": {
                             "type": "number"
                         },
+                        "MinWebservers": {
+                            "type": "number"
+                        },
                         "MinWorkers": {
                             "type": "number"
                         },
@@ -125983,6 +132388,15 @@
                         "AvailabilityZone": {
                             "type": "string"
                         },
+                        "Maintenance": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Maintenance"
+                        },
+                        "MediaStreams": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStream"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -125991,6 +132405,15 @@
                         },
                         "SourceFailoverConfig": {
                             "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        },
+                        "SourceMonitoringConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.SourceMonitoringConfig"
+                        },
+                        "VpcInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.VpcInterface"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -126074,6 +132497,33 @@
             },
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.Fmtp": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelOrder": {
+                    "type": "string"
+                },
+                "Colorimetry": {
+                    "type": "string"
+                },
+                "ExactFramerate": {
+                    "type": "string"
+                },
+                "Par": {
+                    "type": "string"
+                },
+                "Range": {
+                    "type": "string"
+                },
+                "ScanMode": {
+                    "type": "string"
+                },
+                "Tcs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.GatewayBridgeSource": {
             "additionalProperties": false,
             "properties": {
@@ -126089,6 +132539,119 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.InputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Interface"
+                }
+            },
+            "required": [
+                "InputPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Maintenance": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceDay": {
+                    "type": "string"
+                },
+                "MaintenanceStartHour": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaintenanceDay",
+                "MaintenanceStartHour"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamAttributes"
+                },
+                "ClockRate": {
+                    "type": "number"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Fmt": {
+                    "type": "number"
+                },
+                "MediaStreamId": {
+                    "type": "number"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                },
+                "MediaStreamType": {
+                    "type": "string"
+                },
+                "VideoFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MediaStreamId",
+                "MediaStreamName",
+                "MediaStreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Fmtp": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Fmtp"
+                },
+                "Lang": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingName": {
+                    "type": "string"
+                },
+                "InputConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.InputConfiguration"
+                    },
+                    "type": "array"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.Source": {
             "additionalProperties": false,
             "properties": {
@@ -126116,6 +132679,15 @@
                 "MaxLatency": {
                     "type": "number"
                 },
+                "MaxSyncBuffer": {
+                    "type": "number"
+                },
+                "MediaStreamSourceConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamSourceConfiguration"
+                    },
+                    "type": "array"
+                },
                 "MinLatency": {
                     "type": "number"
                 },
@@ -126155,154 +132727,202 @@
             },
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.SourcePriority": {
+        "AWS::MediaConnect::Flow.SourceMonitoringConfig": {
             "additionalProperties": false,
             "properties": {
-                "PrimarySource": {
+                "ThumbnailState": {
                     "type": "string"
                 }
             },
             "required": [
-                "PrimarySource"
+                "ThumbnailState"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
+        "AWS::MediaConnect::Flow.SourcePriority": {
             "additionalProperties": false,
             "properties": {
-                "VpcInterfaceName": {
+                "PrimarySource": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PrimarySource"
+            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement": {
+        "AWS::MediaConnect::Flow.VpcInterface": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Name": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "NetworkInterfaceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "NetworkInterfaceType": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "RoleArn": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DataTransferSubscriberFeePercent": {
-                            "type": "number"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Encryption": {
-                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
-                        },
-                        "EntitlementStatus": {
-                            "type": "string"
-                        },
-                        "FlowArn": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Description",
-                        "FlowArn",
-                        "Name",
-                        "Subscribers"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::MediaConnect::FlowEntitlement"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "SubnetId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "RoleArn",
+                "SecurityGroupIds",
+                "SubnetId"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
-                "Algorithm": {
-                    "type": "string"
-                },
-                "ConstantInitializationVector": {
-                    "type": "string"
-                },
-                "DeviceId": {
-                    "type": "string"
-                },
-                "KeyType": {
-                    "type": "string"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "ResourceId": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                },
-                "SecretArn": {
-                    "type": "string"
-                },
-                "Url": {
+                "VpcInterfaceName": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Algorithm",
-                "RoleArn"
-            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowOutput": {
+        "AWS::MediaConnect::FlowEntitlement": {
+            "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": {
+                        "DataTransferSubscriberFeePercent": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
+                        },
+                        "EntitlementStatus": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "FlowArn",
+                        "Name",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowEntitlement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "DeviceId": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Algorithm",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -126358,12 +132978,21 @@
                         "MaxLatency": {
                             "type": "number"
                         },
+                        "MediaStreamOutputConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "MinLatency": {
                             "type": "number"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "OutputStatus": {
+                            "type": "string"
+                        },
                         "Port": {
                             "type": "number"
                         },
@@ -126410,6 +133039,41 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationIp": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Interface"
+                }
+            },
+            "required": [
+                "DestinationIp",
+                "DestinationPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.EncodingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFactor": {
+                    "type": "number"
+                },
+                "EncoderProfile": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionFactor"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -126432,6 +133096,43 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.DestinationConfiguration"
+                    },
+                    "type": "array"
+                },
+                "EncodingName": {
+                    "type": "string"
+                },
+                "EncodingParameters": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.EncodingParameters"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
@@ -127589,6 +134290,9 @@
             "properties": {
                 "AvailSettings": {
                     "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                },
+                "Scte35SegmentationScope": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -128515,6 +135219,9 @@
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "NumRefFrames": {
                     "type": "number"
                 },
@@ -128662,6 +135369,9 @@
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "MvOverPictureBoundaries": {
                     "type": "string"
                 },
@@ -130371,7 +137081,7 @@
             },
             "type": "object"
         },
-        "AWS::MediaLive::Input": {
+        "AWS::MediaLive::ChannelPlacementGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130406,57 +137116,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
-                            },
-                            "type": "array"
+                        "ClusterId": {
+                            "type": "string"
                         },
-                        "InputDevices": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
-                            },
-                            "type": "array"
+                        "Name": {
+                            "type": "string"
                         },
-                        "InputSecurityGroups": {
+                        "Nodes": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "MediaConnectFlows": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Sources": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                                "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup.Tags"
                             },
                             "type": "array"
-                        },
-                        "Tags": {
-                            "type": "object"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "Vpc": {
-                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
                         }
                     },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Input"
+                        "AWS::MediaLive::ChannelPlacementGroup"
                     ],
                     "type": "string"
                 },
@@ -130474,76 +137157,727 @@
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Input.InputDestinationRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "StreamName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputSourceRequest": {
+        "AWS::MediaLive::ChannelPlacementGroup.Tags": {
             "additionalProperties": false,
             "properties": {
-                "PasswordParam": {
-                    "type": "string"
-                },
-                "Url": {
+                "Key": {
                     "type": "string"
                 },
-                "Username": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputVpcRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "SecurityGroupIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "SubnetIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "FlowArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::InputSecurityGroup": {
+        "AWS::MediaLive::CloudWatchAlarmTemplate": {
+            "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": {
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetResourceType": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods",
+                        "GroupIdentifier",
+                        "MetricName",
+                        "Name",
+                        "Period",
+                        "Statistic",
+                        "TargetResourceType",
+                        "Threshold",
+                        "TreatMissingData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::CloudWatchAlarmTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster": {
+            "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": {
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster.ClusterNetworkSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Cluster.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.ClusterNetworkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRoute": {
+                    "type": "string"
+                },
+                "InterfaceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Cluster.InterfaceMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.InterfaceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalInterfaceName": {
+                    "type": "string"
+                },
+                "NetworkId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventTargets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget"
+                            },
+                            "type": "array"
+                        },
+                        "EventType": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "EventType",
+                        "GroupIdentifier",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "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": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "InputDevices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
+                            },
+                            "type": "array"
+                        },
+                        "InputSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MediaConnectFlows": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                            },
+                            "type": "array"
+                        },
+                        "SrtSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.SrtSettingsRequest"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDestinationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputVpcRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerDecryptionRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "PassphraseSecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerDecryptionRequest"
+                },
+                "MinimumLatency": {
+                    "type": "number"
+                },
+                "SrtListenerAddress": {
+                    "type": "string"
+                },
+                "SrtListenerPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtSettingsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SrtCallerSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerSourceRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130654,41 +137988,500 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
-                            },
-                            "type": "array"
-                        },
-                        "MultiplexSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "MultiplexSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZones",
+                        "MultiplexSettings",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntitlementArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexMediaConnectOutputDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumVideoBufferDelayMilliseconds": {
+                    "type": "number"
+                },
+                "TransportStreamBitrate": {
+                    "type": "number"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "TransportStreamReservedBitrate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TransportStreamBitrate",
+                "TransportStreamId"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram": {
+            "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": {
+                        "MultiplexId": {
+                            "type": "string"
+                        },
+                        "MultiplexProgramSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
+                        },
+                        "PacketIdentifiersMap": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        },
+                        "PipelineDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredChannelPipeline": {
+                            "type": "string"
+                        },
+                        "ProgramName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplexprogram"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbSubPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbTeletextPid": {
+                    "type": "number"
+                },
+                "EtvPlatformPid": {
+                    "type": "number"
+                },
+                "EtvSignalPid": {
+                    "type": "number"
+                },
+                "KlvDataPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "PcrPid": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "number"
+                },
+                "PrivateMetadataPid": {
+                    "type": "number"
+                },
+                "Scte27Pids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Scte35Pid": {
+                    "type": "number"
+                },
+                "TimedMetadataPid": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveChannelPipeline": {
+                    "type": "string"
+                },
+                "PipelineId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PreferredChannelPipeline": {
+                    "type": "string"
+                },
+                "ProgramNumber": {
+                    "type": "number"
+                },
+                "ServiceDescriptor": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
+                },
+                "VideoSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                }
+            },
+            "required": [
+                "ProgramNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumBitrate": {
+                    "type": "number"
+                },
+                "MinimumBitrate": {
+                    "type": "number"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantBitrate": {
+                    "type": "number"
+                },
+                "StatmuxSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network": {
+            "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": {
+                        "IpPools": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.IpPool"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Routes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Route"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpPools",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Network"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.IpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Route": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Gateway": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::SdiSource": {
+            "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": {
+                        "Mode": {
+                            "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                                "$ref": "#/definitions/AWS::MediaLive::SdiSource.Tags"
                             },
                             "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AvailabilityZones",
-                        "MultiplexSettings",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplex"
+                        "AWS::MediaLive::SdiSource"
                     ],
                     "type": "string"
                 },
@@ -130707,47 +138500,7 @@
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "EntitlementArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
-            "additionalProperties": false,
-            "properties": {
-                "MultiplexMediaConnectOutputDestinationSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumVideoBufferDelayMilliseconds": {
-                    "type": "number"
-                },
-                "TransportStreamBitrate": {
-                    "type": "number"
-                },
-                "TransportStreamId": {
-                    "type": "number"
-                },
-                "TransportStreamReservedBitrate": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "TransportStreamBitrate",
-                "TransportStreamId"
-            ],
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.Tags": {
+        "AWS::MediaLive::SdiSource.Tags": {
             "additionalProperties": false,
             "properties": {
                 "Key": {
@@ -130759,7 +138512,7 @@
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram": {
+        "AWS::MediaLive::SignalMap": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130794,36 +138547,49 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ChannelId": {
-                            "type": "string"
+                        "CloudWatchAlarmTemplateGroupIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "MultiplexId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MultiplexProgramSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
-                        },
-                        "PacketIdentifiersMap": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        "DiscoveryEntryPointArn": {
+                            "type": "string"
                         },
-                        "PipelineDetails": {
+                        "EventBridgeRuleTemplateGroupIdentifiers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "PreferredChannelPipeline": {
-                            "type": "string"
+                        "ForceRediscovery": {
+                            "type": "boolean"
                         },
-                        "ProgramName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
+                    "required": [
+                        "DiscoveryEntryPointArn",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplexprogram"
+                        "AWS::MediaLive::SignalMap"
                     ],
                     "type": "string"
                 },
@@ -130837,143 +138603,81 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+        "AWS::MediaLive::SignalMap.MediaResource": {
             "additionalProperties": false,
             "properties": {
-                "AudioPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbSubPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbTeletextPid": {
-                    "type": "number"
-                },
-                "EtvPlatformPid": {
-                    "type": "number"
-                },
-                "EtvSignalPid": {
-                    "type": "number"
-                },
-                "KlvDataPids": {
+                "Destinations": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
                 },
-                "PcrPid": {
-                    "type": "number"
-                },
-                "PmtPid": {
-                    "type": "number"
-                },
-                "PrivateMetadataPid": {
-                    "type": "number"
+                "Name": {
+                    "type": "string"
                 },
-                "Scte27Pids": {
+                "Sources": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
-                },
-                "Scte35Pid": {
-                    "type": "number"
-                },
-                "TimedMetadataPid": {
-                    "type": "number"
-                },
-                "VideoPid": {
-                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+        "AWS::MediaLive::SignalMap.MediaResourceNeighbor": {
             "additionalProperties": false,
             "properties": {
-                "ActiveChannelPipeline": {
+                "Arn": {
                     "type": "string"
                 },
-                "PipelineId": {
+                "Name": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Arn"
+            ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+        "AWS::MediaLive::SignalMap.MonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "ProviderName": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ServiceName": {
+                "ErrorMessage": {
+                    "type": "string"
+                },
+                "Status": {
                     "type": "string"
                 }
             },
             "required": [
-                "ProviderName",
-                "ServiceName"
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+        "AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "PreferredChannelPipeline": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ProgramNumber": {
-                    "type": "number"
-                },
-                "ServiceDescriptor": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
-                },
-                "VideoSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                "Status": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ProgramNumber"
+                "DetailsUri",
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumBitrate": {
-                    "type": "number"
-                },
-                "MinimumBitrate": {
-                    "type": "number"
-                },
-                "Priority": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "ConstantBitrate": {
-                    "type": "number"
-                },
-                "StatmuxSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
-                }
-            },
-            "type": "object"
-        },
         "AWS::MediaPackage::Asset": {
             "additionalProperties": false,
             "properties": {
@@ -132163,6 +139867,9 @@
                         "Description": {
                             "type": "string"
                         },
+                        "InputType": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -132400,9 +140107,18 @@
                         "ContainerType": {
                             "type": "string"
                         },
+                        "DashManifests": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Description": {
                             "type": "string"
                         },
+                        "ForceEndpointErrorConfiguration": {
+                            "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration"
+                        },
                         "HlsManifests": {
                             "items": {
                                 "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration"
@@ -132434,6 +140150,7 @@
                     "required": [
                         "ChannelGroupName",
                         "ChannelName",
+                        "ContainerType",
                         "OriginEndpointName"
                     ],
                     "type": "object"
@@ -132459,6 +140176,63 @@
             ],
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DrmSignaling": {
+                    "type": "string"
+                },
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.FilterConfiguration"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScteDash": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ScteDash"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming"
+                }
+            },
+            "required": [
+                "ManifestName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming": {
+            "additionalProperties": false,
+            "properties": {
+                "TimingMode": {
+                    "type": "string"
+                },
+                "TimingSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -132527,6 +140301,18 @@
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointErrorConditions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -132599,6 +140385,15 @@
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ScteDash": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkerDash": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.ScteHls": {
             "additionalProperties": false,
             "properties": {
@@ -133391,6 +141186,9 @@
         "AWS::MediaTailor::PlaybackConfiguration.AvailSuppression": {
             "additionalProperties": false,
             "properties": {
+                "FillPolicy": {
+                    "type": "string"
+                },
                 "Mode": {
                     "type": "string"
                 },
@@ -134244,102 +142042,312 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AssociatedRoles": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
-                            },
-                            "type": "array"
-                        },
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BackupRetentionPeriod": {
-                            "type": "number"
-                        },
-                        "CopyTagsToSnapshot": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBInstanceParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBPort": {
+                            "type": "number"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ServerlessScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBClusterParameterGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBInstance": {
+            "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": {
+                        "AllowMajorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBClusterParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBInstanceParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBPort": {
-                            "type": "number"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
-                        },
-                        "DeletionProtection": {
+                        "AutoMinorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "EnableCloudwatchLogsExports": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "EngineVersion": {
+                        "AvailabilityZone": {
                             "type": "string"
                         },
-                        "IamAuthEnabled": {
-                            "type": "boolean"
-                        },
-                        "KmsKeyId": {
+                        "DBClusterIdentifier": {
                             "type": "string"
                         },
-                        "PreferredBackupWindow": {
+                        "DBInstanceClass": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
+                        "DBInstanceIdentifier": {
                             "type": "string"
                         },
-                        "RestoreToTime": {
+                        "DBParameterGroupName": {
                             "type": "string"
                         },
-                        "RestoreType": {
+                        "DBSnapshotIdentifier": {
                             "type": "string"
                         },
-                        "ServerlessScalingConfiguration": {
-                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
-                        },
-                        "SnapshotIdentifier": {
+                        "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "SourceDBClusterIdentifier": {
+                        "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
-                        "StorageEncrypted": {
-                            "type": "boolean"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UseLatestRestorableTime": {
-                            "type": "boolean"
-                        },
-                        "VpcSecurityGroupIds": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBCluster"
+                        "AWS::Neptune::DBInstance"
                     ],
                     "type": "string"
                 },
@@ -134353,42 +142361,12 @@
                 }
             },
             "required": [
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.DBClusterRole": {
-            "additionalProperties": false,
-            "properties": {
-                "FeatureName": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RoleArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxCapacity": {
-                    "type": "number"
-                },
-                "MinCapacity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "MaxCapacity",
-                "MinCapacity"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBClusterParameterGroup": {
+        "AWS::Neptune::DBParameterGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134451,7 +142429,7 @@
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBClusterParameterGroup"
+                        "AWS::Neptune::DBParameterGroup"
                     ],
                     "type": "string"
                 },
@@ -134470,7 +142448,7 @@
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBInstance": {
+        "AWS::Neptune::DBSubnetGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134505,115 +142483,17 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowMajorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AutoMinorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AvailabilityZone": {
-                            "type": "string"
-                        },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBInstanceClass": {
-                            "type": "string"
-                        },
-                        "DBInstanceIdentifier": {
-                            "type": "string"
-                        },
-                        "DBParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBSnapshotIdentifier": {
+                        "DBSubnetGroupDescription": {
                             "type": "string"
                         },
                         "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DBInstanceClass"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Neptune::DBInstance"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBParameterGroup": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
+                        "SubnetIds": {
                             "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
                                 "type": "string"
                             },
                             "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Family": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "type": "object"
                         },
                         "Tags": {
                             "items": {
@@ -134623,15 +142503,14 @@
                         }
                     },
                     "required": [
-                        "Description",
-                        "Family",
-                        "Parameters"
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBParameterGroup"
+                        "AWS::Neptune::DBSubnetGroup"
                     ],
                     "type": "string"
                 },
@@ -134650,7 +142529,7 @@
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBSubnetGroup": {
+        "AWS::Neptune::EventSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134685,34 +142564,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DBSubnetGroupDescription": {
-                            "type": "string"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
+                        "Enabled": {
+                            "type": "boolean"
                         },
-                        "SubnetIds": {
+                        "EventCategories": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Tags": {
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DBSubnetGroupDescription",
-                        "SubnetIds"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBSubnetGroup"
+                        "AWS::Neptune::EventSubscription"
                     ],
                     "type": "string"
                 },
@@ -134726,8 +142604,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -135193,6 +143070,15 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts": {
+            "additionalProperties": false,
+            "properties": {
+                "TcpIdleTimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::FirewallPolicy.IPSet": {
             "additionalProperties": false,
             "properties": {
@@ -135238,6 +143124,9 @@
         "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
             "additionalProperties": false,
             "properties": {
+                "FlowTimeouts": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts"
+                },
                 "RuleOrder": {
                     "type": "string"
                 },
@@ -136143,39 +144032,311 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CoreNetworkId": {
+                        "CoreNetworkId": {
+                            "type": "string"
+                        },
+                        "EdgeLocation": {
+                            "type": "string"
+                        },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange"
+                        },
+                        "ProposedSegmentChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CoreNetworkId",
+                        "EdgeLocation",
+                        "Options",
+                        "TransportAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "SegmentName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer": {
+            "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": {
+                        "BgpOptions": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
+                        },
+                        "ConnectAttachmentId": {
+                            "type": "string"
+                        },
+                        "CoreNetworkAddress": {
+                            "type": "string"
+                        },
+                        "InsideCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PeerAddress": {
+                            "type": "string"
+                        },
+                        "SubnetArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectAttachmentId",
+                        "PeerAddress"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectPeer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "CoreNetworkAsn": {
+                    "type": "number"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BgpConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
+                    },
+                    "type": "array"
+                },
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "InsideCidrBlocks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::CoreNetwork": {
+            "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": {
+                        "Description": {
                             "type": "string"
                         },
-                        "EdgeLocation": {
+                        "GlobalNetworkId": {
                             "type": "string"
                         },
-                        "Options": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
-                        },
-                        "ProposedSegmentChange": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        "PolicyDocument": {
+                            "type": "object"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TransportAttachmentId": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "CoreNetworkId",
-                        "EdgeLocation",
-                        "Options",
-                        "TransportAttachmentId"
+                        "GlobalNetworkId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::NetworkManager::ConnectAttachment"
+                        "AWS::NetworkManager::CoreNetwork"
                     ],
                     "type": "string"
                 },
@@ -136194,264 +144355,55 @@
             ],
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "Protocol": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
             "additionalProperties": false,
             "properties": {
-                "AttachmentPolicyRuleNumber": {
+                "Asn": {
                     "type": "number"
                 },
-                "SegmentName": {
+                "EdgeLocation": {
                     "type": "string"
                 },
-                "Tags": {
+                "InsideCidrBlocks": {
                     "items": {
-                        "$ref": "#/definitions/Tag"
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectPeer": {
-            "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": {
-                        "BgpOptions": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
-                        },
-                        "ConnectAttachmentId": {
-                            "type": "string"
-                        },
-                        "CoreNetworkAddress": {
-                            "type": "string"
-                        },
-                        "InsideCidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "PeerAddress": {
-                            "type": "string"
-                        },
-                        "SubnetArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "ConnectAttachmentId",
-                        "PeerAddress"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::ConnectPeer"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "CoreNetworkAsn": {
-                    "type": "number"
-                },
-                "PeerAddress": {
-                    "type": "string"
-                },
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup": {
             "additionalProperties": false,
             "properties": {
-                "BgpConfigurations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
-                    },
-                    "type": "array"
-                },
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "InsideCidrBlocks": {
+                "EdgeLocations": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "PeerAddress": {
+                "Name": {
                     "type": "string"
                 },
-                "Protocol": {
-                    "type": "string"
+                "Segments": {
+                    "$ref": "#/definitions/AWS::NetworkManager::CoreNetwork.Segments"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
             "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "GlobalNetworkId": {
-                            "type": "string"
-                        },
-                        "PolicyDocument": {
-                            "type": "object"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "EdgeLocations": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "GlobalNetworkId"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::CoreNetwork"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
-            "additionalProperties": false,
-            "properties": {
-                "Asn": {
-                    "type": "number"
+                    "type": "array"
                 },
-                "EdgeLocation": {
+                "Name": {
                     "type": "string"
                 },
-                "InsideCidrBlocks": {
+                "SharedSegments": {
                     "items": {
                         "type": "string"
                     },
@@ -136460,19 +144412,16 @@
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
+        "AWS::NetworkManager::CoreNetwork.Segments": {
             "additionalProperties": false,
             "properties": {
-                "EdgeLocations": {
+                "SendTo": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Name": {
-                    "type": "string"
-                },
-                "SharedSegments": {
+                "SendVia": {
                     "items": {
                         "type": "string"
                     },
@@ -137055,6 +145004,12 @@
                         "CoreNetworkId": {
                             "type": "string"
                         },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange"
                         },
@@ -137095,6 +145050,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137292,9 +145265,15 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
                         "PeeringId": {
                             "type": "string"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange"
                         },
@@ -137335,6 +145314,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137394,6 +145391,9 @@
                         "Options": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.VpcOptions"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedSegmentChange"
                         },
@@ -137441,6 +145441,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::VpcAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -138257,6 +146275,22 @@
             },
             "type": "object"
         },
+        "AWS::OSIS::Pipeline.VpcAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachToVpc": {
+                    "type": "boolean"
+                },
+                "CidrBlock": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachToVpc",
+                "CidrBlock"
+            ],
+            "type": "object"
+        },
         "AWS::OSIS::Pipeline.VpcEndpoint": {
             "additionalProperties": false,
             "properties": {
@@ -138286,6 +146320,12 @@
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "VpcAttachmentOptions": {
+                    "$ref": "#/definitions/AWS::OSIS::Pipeline.VpcAttachmentOptions"
+                },
+                "VpcEndpointManagement": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -139696,6 +147736,9 @@
                         "OffPeakWindowOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.OffPeakWindowOptions"
                         },
+                        "SkipShardMigrationWait": {
+                            "type": "boolean"
+                        },
                         "SnapshotOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
                         },
@@ -139749,6 +147792,9 @@
                 "InternalUserDatabaseEnabled": {
                     "type": "boolean"
                 },
+                "JWTOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.JWTOptions"
+                },
                 "MasterUserOptions": {
                     "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
                 },
@@ -139897,6 +147943,24 @@
             ],
             "type": "object"
         },
+        "AWS::OpenSearchService::Domain.JWTOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "PublicKey": {
+                    "type": "string"
+                },
+                "RolesKey": {
+                    "type": "string"
+                },
+                "SubjectKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::OpenSearchService::Domain.LogPublishingOption": {
             "additionalProperties": false,
             "properties": {
@@ -142836,6 +150900,200 @@
             },
             "type": "object"
         },
+        "AWS::PCAConnectorSCEP::Challenge": {
+            "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": {
+                        "ConnectorArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConnectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Challenge"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector": {
+            "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": {
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "MobileDeviceManagement": {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Connector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.IntuneConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AzureApplicationId": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AzureApplicationId",
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "Intune": {
+                    "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.IntuneConfiguration"
+                }
+            },
+            "required": [
+                "Intune"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Panorama::ApplicationInstance": {
             "additionalProperties": false,
             "properties": {
@@ -146827,6 +155085,9 @@
                         "EnrichmentParameters": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeEnrichmentParameters"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "LogConfiguration": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeLogConfiguration"
                         },
@@ -147031,6 +155292,26 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValue": {
+                    "type": "string"
+                },
+                "DimensionValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName",
+                "DimensionValue",
+                "DimensionValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.EcsContainerOverride": {
             "additionalProperties": false,
             "properties": {
@@ -147228,6 +155509,45 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValue",
+                "MeasureValueType",
+                "MultiMeasureAttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Pipes::Pipe.MultiMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings",
+                "MultiMeasureName"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.NetworkConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -147758,6 +156078,9 @@
                 },
                 "StepFunctionStateMachineParameters": {
                     "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetStateMachineParameters"
+                },
+                "TimestreamParameters": {
+                    "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetTimestreamParameters"
                 }
             },
             "type": "object"
@@ -147826,6 +156149,50 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.PipeTargetTimestreamParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "EpochTimeUnit": {
+                    "type": "string"
+                },
+                "MultiMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "SingleMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.SingleMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "TimeFieldType": {
+                    "type": "string"
+                },
+                "TimeValue": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                },
+                "VersionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionMappings",
+                "TimeValue",
+                "VersionValue"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.PlacementConstraint": {
             "additionalProperties": false,
             "properties": {
@@ -147920,6 +156287,26 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.SingleMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureName",
+                "MeasureValue",
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Proton::EnvironmentAccountConnection": {
             "additionalProperties": false,
             "properties": {
@@ -148160,6 +156547,975 @@
             ],
             "type": "object"
         },
+        "AWS::QBusiness::Application": {
+            "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": {
+                        "AttachmentsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AttachmentsConfiguration"
+                        },
+                        "AutoSubscriptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AutoSubscriptionConfiguration"
+                        },
+                        "ClientIdsForOIDC": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.EncryptionConfiguration"
+                        },
+                        "IamIdentityProviderArn": {
+                            "type": "string"
+                        },
+                        "IdentityCenterInstanceArn": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "PersonalizationConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.PersonalizationConfiguration"
+                        },
+                        "QAppsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.QAppsConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AttachmentsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachmentsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AutoSubscriptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoSubscribe": {
+                    "type": "string"
+                },
+                "DefaultSubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoSubscribe"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.PersonalizationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PersonalizationControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PersonalizationControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.QAppsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QAppsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QAppsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentEnrichmentConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SyncSchedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DataSourceVpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "IndexId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeValueOperator": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DateValue": {
+                    "type": "string"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringListValue": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InlineConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration"
+                    },
+                    "type": "array"
+                },
+                "PostExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                },
+                "PreExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.HookConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InvocationCondition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "DocumentContentOperator": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CapacityConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Index.IndexCapacityConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentAttributeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QBusiness::Index.DocumentAttributeConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.DocumentAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Search": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexCapacityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "TextDocumentStatistics": {
+                    "$ref": "#/definitions/AWS::QBusiness::Index.TextDocumentStatistics"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.TextDocumentStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexedTextBytes": {
+                    "type": "number"
+                },
+                "IndexedTextDocumentCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "AuthConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.PluginAuthConfiguration"
+                        },
+                        "CustomPluginConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.CustomPluginConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ServerUrl": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "AuthConfiguration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Plugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.APISchema": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.BasicAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.CustomPluginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSchema": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.APISchema"
+                },
+                "ApiSchemaType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSchema",
+                "ApiSchemaType",
+                "Description"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.PluginAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.BasicAuthConfiguration"
+                },
+                "NoAuthConfiguration": {
+                    "type": "object"
+                },
+                "OAuth2ClientCredentialConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever.RetrieverConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Retriever"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.KendraIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.NativeIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.RetrieverConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KendraIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.KendraIndexConfiguration"
+                },
+                "NativeIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.NativeIndexConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "IdentityProviderConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience.IdentityProviderConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SamplePromptsControlMode": {
+                            "type": "string"
+                        },
+                        "Subtitle": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Title": {
+                            "type": "string"
+                        },
+                        "WelcomeMessage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::WebExperience"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.IdentityProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OpenIDConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration"
+                },
+                "SamlConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.SamlProviderConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsArn": {
+                    "type": "string"
+                },
+                "SecretsRole": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretsArn",
+                "SecretsRole"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.SamlProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthenticationUrl"
+            ],
+            "type": "object"
+        },
         "AWS::QLDB::Ledger": {
             "additionalProperties": false,
             "properties": {
@@ -148545,6 +157901,9 @@
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.SheetDefinition"
@@ -149339,6 +158698,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -149492,6 +158870,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149576,6 +158957,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ComboChartSortConfiguration"
                 },
@@ -150593,6 +159977,9 @@
         "AWS::QuickSight::Analysis.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -150648,6 +160035,9 @@
         "AWS::QuickSight::Analysis.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -150738,6 +160128,9 @@
         "AWS::QuickSight::Analysis.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 }
@@ -151069,6 +160462,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -151225,6 +160621,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.NumericEqualityFilter"
                 },
@@ -151298,6 +160697,9 @@
         "AWS::QuickSight::Analysis.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -151327,6 +160729,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -151472,6 +160877,9 @@
         "AWS::QuickSight::Analysis.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 },
@@ -152677,6 +162085,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153190,6 +162607,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.SmallMultiplesOptions"
                 },
@@ -153552,6 +162972,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153938,6 +163382,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -154784,6 +164231,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -155814,6 +165270,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157188,6 +166653,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -157197,6 +166671,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DataLabelOptions"
                 },
@@ -157233,6 +166710,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157443,6 +166935,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard": {
             "additionalProperties": false,
             "properties": {
@@ -158352,6 +167856,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -158505,6 +168028,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -158589,6 +168115,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ComboChartSortConfiguration"
                 },
@@ -159823,6 +169352,9 @@
         "AWS::QuickSight::Dashboard.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -159878,6 +169410,9 @@
         "AWS::QuickSight::Dashboard.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -159968,6 +169503,9 @@
         "AWS::QuickSight::Dashboard.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 }
@@ -160326,6 +169864,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -160482,6 +170023,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.NumericEqualityFilter"
                 },
@@ -160555,6 +170099,9 @@
         "AWS::QuickSight::Dashboard.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -160584,6 +170131,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -160729,6 +170279,9 @@
         "AWS::QuickSight::Dashboard.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 },
@@ -161934,6 +171487,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -162447,6 +172009,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.SmallMultiplesOptions"
                 },
@@ -162821,6 +172386,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -163207,6 +172796,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -165101,6 +174693,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166493,6 +176094,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -166502,6 +176112,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataLabelOptions"
                 },
@@ -166538,6 +176151,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166748,6 +176376,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSet": {
             "additionalProperties": false,
             "properties": {
@@ -166822,6 +176462,12 @@
                             },
                             "type": "object"
                         },
+                        "FolderArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "ImportMode": {
                             "type": "string"
                         },
@@ -167190,6 +176836,9 @@
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.LookbackWindow"
                 }
             },
+            "required": [
+                "LookbackWindow"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
@@ -167314,8 +176963,7 @@
                 }
             },
             "required": [
-                "Alias",
-                "Source"
+                "Alias"
             ],
             "type": "object"
         },
@@ -167347,6 +176995,11 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Size",
+                "SizeUnit"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.NewDefaultValues": {
@@ -167452,6 +177105,9 @@
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.IncrementalRefresh"
                 }
             },
+            "required": [
+                "IncrementalRefresh"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.RelationalTable": {
@@ -167685,8 +177341,30 @@
                 },
                 "TagColumnOperation": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                },
+                "UntagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UntagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UntagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "TagNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "TagNames"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.UploadSettings": {
@@ -167791,6 +177469,10 @@
                             "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -167809,7 +177491,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -168024,6 +177707,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.IdentityCenterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableIdentityPropagation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -168156,6 +177848,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.RedshiftIAMParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoCreateDatabaseUser": {
+                    "type": "boolean"
+                },
+                "DatabaseGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DatabaseUser": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.RedshiftParameters": {
             "additionalProperties": false,
             "properties": {
@@ -168168,6 +177884,12 @@
                 "Host": {
                     "type": "string"
                 },
+                "IAMParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftIAMParameters"
+                },
+                "IdentityCenterConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.IdentityCenterConfiguration"
+                },
                 "Port": {
                     "type": "number"
                 }
@@ -168188,6 +177910,9 @@
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -168351,6 +178076,113 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Folder": {
+            "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": {
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "FolderId": {
+                            "type": "string"
+                        },
+                        "FolderType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentFolderArn": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Folder.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SharingModel": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Folder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Folder.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::RefreshSchedule": {
             "additionalProperties": false,
             "properties": {
@@ -169347,6 +179179,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -169539,6 +179390,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -169623,6 +179477,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ComboChartSortConfiguration"
                 },
@@ -170616,6 +180473,9 @@
         "AWS::QuickSight::Template.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -170671,6 +180531,9 @@
         "AWS::QuickSight::Template.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -170761,6 +180624,9 @@
         "AWS::QuickSight::Template.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 }
@@ -171092,6 +180958,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -171248,6 +181117,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.NumericEqualityFilter"
                 },
@@ -171321,6 +181193,9 @@
         "AWS::QuickSight::Template.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -171350,6 +181225,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -171495,6 +181373,9 @@
         "AWS::QuickSight::Template.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 },
@@ -172700,6 +182581,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173194,6 +183084,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.SmallMultiplesOptions"
                 },
@@ -173556,6 +183449,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173942,6 +183859,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -174758,6 +184678,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -175788,6 +185717,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -176523,6 +186461,9 @@
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.SheetDefinition"
@@ -177297,6 +187238,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -177306,6 +187256,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DataLabelOptions"
                 },
@@ -177342,6 +187295,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -177552,6 +187520,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Theme": {
             "additionalProperties": false,
             "properties": {
@@ -178283,6 +188263,9 @@
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "Expression": {
                     "type": "string"
                 },
@@ -178389,6 +188372,9 @@
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "IsIncludedInTopic": {
                     "type": "boolean"
                 },
@@ -179074,9 +189060,15 @@
                         "EnableIAMDatabaseAuthentication": {
                             "type": "boolean"
                         },
+                        "EnableLocalWriteForwarding": {
+                            "type": "boolean"
+                        },
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineMode": {
                             "type": "string"
                         },
@@ -179526,6 +189518,9 @@
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180562,6 +190557,9 @@
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180573,6 +190571,12 @@
                         },
                         "StorageEncrypted": {
                             "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "type": "object"
@@ -181281,6 +191285,15 @@
                 "BucketName": {
                     "type": "string"
                 },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogExports": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "S3KeyPrefix": {
                     "type": "string"
                 }
@@ -184702,6 +194715,15 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AcceptRoleSessionName": {
+                            "type": "boolean"
+                        },
+                        "AttributeMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RolesAnywhere::Profile.AttributeMapping"
+                            },
+                            "type": "array"
+                        },
                         "DurationSeconds": {
                             "type": "number"
                         },
@@ -184763,6 +194785,37 @@
             ],
             "type": "object"
         },
+        "AWS::RolesAnywhere::Profile.AttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateField": {
+                    "type": "string"
+                },
+                "MappingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RolesAnywhere::Profile.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateField",
+                "MappingRules"
+            ],
+            "type": "object"
+        },
+        "AWS::RolesAnywhere::Profile.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Specifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Specifier"
+            ],
+            "type": "object"
+        },
         "AWS::RolesAnywhere::TrustAnchor": {
             "additionalProperties": false,
             "properties": {
@@ -186994,6 +197047,9 @@
                 "FirewallDomainListId": {
                     "type": "string"
                 },
+                "FirewallDomainRedirectionAction": {
+                    "type": "string"
+                },
                 "Priority": {
                     "type": "number"
                 },
@@ -187589,6 +197645,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DelegationRecord": {
+                            "type": "string"
+                        },
                         "DomainName": {
                             "type": "string"
                         },
@@ -187615,7 +197674,6 @@
                         }
                     },
                     "required": [
-                        "DomainName",
                         "RuleType"
                     ],
                     "type": "object"
@@ -188553,6 +198611,9 @@
                         "$ref": "#/definitions/AWS::S3::Bucket.Rule"
                     },
                     "type": "array"
+                },
+                "TransitionDefaultMinimumObjectSize": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -190169,6 +200230,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.BucketEncryption"
+                        },
                         "BucketName": {
                             "type": "string"
                         },
@@ -190201,11 +200265,53 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
             ],
             "type": "object"
         },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
         "AWS::S3ObjectLambda::AccessPoint": {
             "additionalProperties": false,
             "properties": {
@@ -191219,6 +201325,18 @@
             ],
             "type": "object"
         },
+        "AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventBusArn"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
             "additionalProperties": false,
             "properties": {
@@ -191228,6 +201346,9 @@
                 "Enabled": {
                     "type": "boolean"
                 },
+                "EventBridgeDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination"
+                },
                 "KinesisFirehoseDestination": {
                     "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
                 },
@@ -191574,6 +201695,1175 @@
             },
             "type": "object"
         },
+        "AWS::SES::MailManagerAddonInstance": {
+            "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": {
+                        "AddonSubscriptionId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonSubscriptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerAddonSubscription": {
+            "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": {
+                        "AddonName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive": {
+            "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": {
+                        "ArchiveName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Retention": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive.ArchiveRetention"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerArchive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive.ArchiveRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "RetentionPeriod": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RetentionPeriod"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint": {
+            "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": {
+                        "IngressPointConfiguration": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint.IngressPointConfiguration"
+                        },
+                        "IngressPointName": {
+                            "type": "string"
+                        },
+                        "RuleSetId": {
+                            "type": "string"
+                        },
+                        "StatusToUpdate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RuleSetId",
+                        "TrafficPolicyId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerIngressPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint.IngressPointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SmtpPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay": {
+            "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": {
+                        "Authentication": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay.RelayAuthentication"
+                        },
+                        "RelayName": {
+                            "type": "string"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "ServerName",
+                        "ServerPort"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRelay"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay.RelayAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "NoAuthentication": {
+                    "type": "object"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet": {
+            "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": {
+                        "RuleSetName": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ArchiveAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "TargetArchive": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArchive"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.DeliverToMailboxAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailboxArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MailboxArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RelayAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailFrom": {
+                    "type": "string"
+                },
+                "Relay": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Relay"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ReplaceRecipientAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplaceWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleAction"
+                    },
+                    "type": "array"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Unless": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeader": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.AddHeaderAction"
+                },
+                "Archive": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ArchiveAction"
+                },
+                "DeliverToMailbox": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.DeliverToMailboxAction"
+                },
+                "Drop": {
+                    "type": "object"
+                },
+                "Relay": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RelayAction"
+                },
+                "ReplaceRecipient": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ReplaceRecipientAction"
+                },
+                "Send": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.SendAction"
+                },
+                "WriteToS3": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.S3Action"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanExpression"
+                },
+                "DmarcExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleDmarcExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpExpression"
+                },
+                "NumberExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberExpression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringExpression"
+                },
+                "VerdictExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleDmarcExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MimeHeaderAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Analysis"
+                },
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                },
+                "S3SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.SendAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy": {
+            "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": {
+                        "DefaultAction": {
+                            "type": "string"
+                        },
+                        "MaxMessageSizeBytes": {
+                            "type": "number"
+                        },
+                        "PolicyStatements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyStatement"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "PolicyStatements"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerTrafficPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressAnalysis"
+                }
+            },
+            "required": [
+                "Analysis"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringExpression"
+                },
+                "TlsExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Conditions"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ReceiptFilter": {
             "additionalProperties": false,
             "properties": {
@@ -191865,6 +203155,9 @@
                 "BucketName": {
                     "type": "string"
                 },
+                "IamRoleArn": {
+                    "type": "string"
+                },
                 "KmsKeyArn": {
                     "type": "string"
                 },
@@ -195016,6 +206309,342 @@
             ],
             "type": "object"
         },
+        "AWS::SSMQuickSetup::ConfigurationManager": {
+            "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": {
+                        "ConfigurationDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationDefinitions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMQuickSetup::ConfigurationManager"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeploymentAdministrationRoleArn": {
+                    "type": "string"
+                },
+                "LocalDeploymentExecutionRoleName": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "TypeVersion": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.StatusSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "LastUpdatedAt": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StatusDetails": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusMessage": {
+                    "type": "string"
+                },
+                "StatusType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LastUpdatedAt",
+                "StatusType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application": {
+            "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": {
+                        "ApplicationProviderArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PortalOptions": {
+                            "$ref": "#/definitions/AWS::SSO::Application.PortalOptionsConfiguration"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationProviderArn",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application.PortalOptionsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SignInOptions": {
+                    "$ref": "#/definitions/AWS::SSO::Application.SignInOptions"
+                },
+                "Visibility": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSO::Application.SignInOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationUrl": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Origin"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::ApplicationAssignment": {
+            "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"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "PrincipalId",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::ApplicationAssignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::Assignment": {
             "additionalProperties": false,
             "properties": {
@@ -195101,6 +206730,73 @@
             ],
             "type": "object"
         },
+        "AWS::SSO::Instance": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -195238,55 +206934,168 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CustomerManagedPolicyReferences": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InlinePolicy": {
-                            "type": "object"
-                        },
-                        "InstanceArn": {
+                        "CustomerManagedPolicyReferences": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
+                        },
+                        "RelayStateType": {
+                            "type": "string"
+                        },
+                        "SessionDuration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::PermissionSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.PermissionsBoundary": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedPolicyReference": {
+                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                },
+                "ManagedPolicyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::App": {
+            "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": {
+                        "AppName": {
                             "type": "string"
                         },
-                        "ManagedPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
+                        "AppType": {
                             "type": "string"
                         },
-                        "PermissionsBoundary": {
-                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
-                        },
-                        "RelayStateType": {
+                        "DomainId": {
                             "type": "string"
                         },
-                        "SessionDuration": {
-                            "type": "string"
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "InstanceArn",
-                        "Name"
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SSO::PermissionSet"
+                        "AWS::SageMaker::App"
                     ],
                     "type": "string"
                 },
@@ -195305,34 +207114,25 @@
             ],
             "type": "object"
         },
-        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+        "AWS::SageMaker::App.ResourceSpec": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "InstanceType": {
                     "type": "string"
                 },
-                "Path": {
+                "LifecycleConfigArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::SSO::PermissionSet.PermissionsBoundary": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomerManagedPolicyReference": {
-                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
                 },
-                "ManagedPolicyArn": {
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::App": {
+        "AWS::SageMaker::AppImageConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195367,39 +207167,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppName": {
+                        "AppImageConfigName": {
                             "type": "string"
                         },
-                        "AppType": {
-                            "type": "string"
+                        "CodeEditorAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
                         },
-                        "DomainId": {
-                            "type": "string"
+                        "JupyterLabAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
                         },
-                        "ResourceSpec": {
-                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserProfileName": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "AppName",
-                        "AppType",
-                        "DomainId",
-                        "UserProfileName"
+                        "AppImageConfigName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::App"
+                        "AWS::SageMaker::AppImageConfig"
                     ],
                     "type": "string"
                 },
@@ -195418,22 +207212,113 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::App.ResourceSpec": {
+        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceType": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "SageMakerImageArn": {
+                "Value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
                 },
-                "SageMakerImageVersionArn": {
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig": {
+        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
+                },
+                "KernelSpecs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "KernelSpecs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "DisplayName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Cluster": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195468,33 +207353,39 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppImageConfigName": {
+                        "ClusterName": {
                             "type": "string"
                         },
-                        "CodeEditorAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
+                        "InstanceGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceGroup"
+                            },
+                            "type": "array"
                         },
-                        "JupyterLabAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
+                        "NodeRecovery": {
+                            "type": "string"
                         },
-                        "KernelGatewayImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        "Orchestrator": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.Orchestrator"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppImageConfigName"
+                        "InstanceGroups"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::AppImageConfig"
+                        "AWS::SageMaker::Cluster"
                     ],
                     "type": "string"
                 },
@@ -195513,109 +207404,129 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterEbsVolumeConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "VolumeSizeInGB": {
+                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+        "AWS::SageMaker::Cluster.ClusterInstanceGroup": {
             "additionalProperties": false,
             "properties": {
-                "ContainerArguments": {
+                "CurrentCount": {
+                    "type": "number"
+                },
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceGroupName": {
+                    "type": "string"
+                },
+                "InstanceStorageConfigs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceStorageConfig"
                     },
                     "type": "array"
                 },
-                "ContainerEntrypoint": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LifeCycleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterLifeCycleConfig"
+                },
+                "OnStartDeepHealthChecks": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "ContainerEnvironmentVariables": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
-                    },
-                    "type": "array"
+                "ThreadsPerCore": {
+                    "type": "number"
                 }
             },
+            "required": [
+                "ExecutionRole",
+                "InstanceCount",
+                "InstanceGroupName",
+                "InstanceType",
+                "LifeCycleConfig"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+        "AWS::SageMaker::Cluster.ClusterInstanceStorageConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "EbsVolumeConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterEbsVolumeConfig"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+        "AWS::SageMaker::Cluster.ClusterLifeCycleConfig": {
             "additionalProperties": false,
             "properties": {
-                "DefaultGid": {
-                    "type": "number"
-                },
-                "DefaultUid": {
-                    "type": "number"
+                "OnCreate": {
+                    "type": "string"
                 },
-                "MountPath": {
+                "SourceS3Uri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "OnCreate",
+                "SourceS3Uri"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "ClusterArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ClusterArn"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+        "AWS::SageMaker::Cluster.Orchestrator": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
-                },
-                "KernelSpecs": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
-                    },
-                    "type": "array"
+                "Eks": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig"
                 }
             },
             "required": [
-                "KernelSpecs"
+                "Eks"
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+        "AWS::SageMaker::Cluster.VpcConfig": {
             "additionalProperties": false,
             "properties": {
-                "DisplayName": {
-                    "type": "string"
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Name": {
-                    "type": "string"
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name"
+                "SecurityGroupIds",
+                "Subnets"
             ],
             "type": "object"
         },
@@ -196411,9 +208322,21 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
@@ -196507,9 +208430,21 @@
         "AWS::SageMaker::Domain.DefaultSpaceSettings": {
             "additionalProperties": false,
             "properties": {
+                "CustomFileSystemConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomFileSystemConfig"
+                    },
+                    "type": "array"
+                },
+                "CustomPosixUserConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.CustomPosixUserConfig"
+                },
                 "ExecutionRole": {
                     "type": "string"
                 },
+                "JupyterLabAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterLabAppSettings"
+                },
                 "JupyterServerAppSettings": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
                 },
@@ -196521,6 +208456,9 @@
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "SpaceStorageSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.DefaultSpaceStorageSettings"
                 }
             },
             "required": [
@@ -196585,9 +208523,30 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CodeRepository"
@@ -196617,6 +208576,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196632,6 +208597,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196717,6 +208688,24 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Domain.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -196767,6 +208756,9 @@
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.StudioWebPortalSettings"
                 }
             },
             "required": [
@@ -197851,6 +209843,9 @@
                         },
                         "VendorGuidance": {
                             "type": "string"
+                        },
+                        "Version": {
+                            "type": "number"
                         }
                     },
                     "required": [
@@ -198338,6 +210333,97 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::MlflowTrackingServer": {
+            "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": {
+                        "ArtifactStoreUri": {
+                            "type": "string"
+                        },
+                        "AutomaticModelRegistration": {
+                            "type": "boolean"
+                        },
+                        "MlflowVersion": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingServerName": {
+                            "type": "string"
+                        },
+                        "TrackingServerSize": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ArtifactStoreUri",
+                        "RoleArn",
+                        "TrackingServerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MlflowTrackingServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model": {
             "additionalProperties": false,
             "properties": {
@@ -198426,6 +210512,22 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Model.AdditionalModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.S3DataSource"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "S3DataSource"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ContainerDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -198462,6 +210564,18 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Model.HubAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HubContentArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HubContentArn"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ImageConfig": {
             "additionalProperties": false,
             "properties": {
@@ -198540,6 +210654,9 @@
                 "CompressionType": {
                     "type": "string"
                 },
+                "HubAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.HubAccessConfig"
+                },
                 "ModelAccessConfig": {
                     "$ref": "#/definitions/AWS::SageMaker::Model.ModelAccessConfig"
                 },
@@ -200061,6 +212178,9 @@
                         "ModelApprovalStatus": {
                             "type": "string"
                         },
+                        "ModelCard": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelCard"
+                        },
                         "ModelMetrics": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelMetrics"
                         },
@@ -200082,12 +212202,18 @@
                         "SamplePayloadUrl": {
                             "type": "string"
                         },
+                        "SecurityConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SecurityConfig"
+                        },
                         "SkipModelValidation": {
                             "type": "string"
                         },
                         "SourceAlgorithmSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SourceAlgorithmSpecification"
                         },
+                        "SourceUri": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -200370,6 +212496,34 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceptEula": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AcceptEula"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.ModelCard": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCardContent": {
+                    "type": "string"
+                },
+                "ModelCardStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ModelCardContent",
+                "ModelCardStatus"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelDataQuality": {
             "additionalProperties": false,
             "properties": {
@@ -200382,6 +212536,15 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.S3ModelDataSource"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelInput": {
             "additionalProperties": false,
             "properties": {
@@ -200439,6 +212602,9 @@
                 "ImageDigest": {
                     "type": "string"
                 },
+                "ModelDataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelDataSource"
+                },
                 "ModelDataUrl": {
                     "type": "string"
                 },
@@ -200513,6 +212679,41 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.S3ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionType": {
+                    "type": "string"
+                },
+                "ModelAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelAccessConfig"
+                },
+                "S3DataType": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionType",
+                "S3DataType",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.SecurityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKeyId"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.SourceAlgorithm": {
             "additionalProperties": false,
             "properties": {
@@ -202335,6 +214536,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202350,6 +214557,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202372,6 +214585,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202381,18 +214597,42 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceAppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceIdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceCodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
                 }
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceIdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceJupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Space.CodeRepository"
@@ -202456,6 +214696,85 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::StudioLifecycleConfig": {
+            "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": {
+                        "StudioLifecycleConfigAppType": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigContent": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StudioLifecycleConfigAppType",
+                        "StudioLifecycleConfigContent",
+                        "StudioLifecycleConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::StudioLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile": {
             "additionalProperties": false,
             "properties": {
@@ -202540,9 +214859,21 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
@@ -202657,9 +214988,30 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CodeRepository"
@@ -202689,6 +215041,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202704,6 +215062,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202726,6 +215090,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202750,6 +215117,24 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -202797,6 +215182,9 @@
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.StudioWebPortalSettings"
                 }
             },
             "type": "object"
@@ -203866,6 +216254,13 @@
                             "type": "object"
                         }
                     },
+                    "required": [
+                        "Actions",
+                        "Criteria",
+                        "Description",
+                        "RuleName",
+                        "RuleOrder"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -203884,7 +216279,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -204306,6 +216702,210 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::ConfigurationPolicy": {
+            "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": {
+                        "ConfigurationPolicy": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.Policy"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicy",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ConfigurationPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityHub": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecurityControlId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EnabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlCustomParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledStandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlsConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration"
+                },
+                "ServiceEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::DelegatedAdmin": {
             "additionalProperties": false,
             "properties": {
@@ -204371,6 +216971,77 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::FindingAggregator": {
+            "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": {
+                        "RegionLinkingMode": {
+                            "type": "string"
+                        },
+                        "Regions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegionLinkingMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::FindingAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
@@ -205232,6 +217903,150 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::OrganizationConfiguration": {
+            "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": {
+                        "AutoEnable": {
+                            "type": "boolean"
+                        },
+                        "AutoEnableStandards": {
+                            "type": "string"
+                        },
+                        "ConfigurationType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoEnable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::OrganizationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::PolicyAssociation": {
+            "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": {
+                        "ConfigurationPolicyId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicyId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::PolicyAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::ProductSubscription": {
             "additionalProperties": false,
             "properties": {
@@ -205267,18 +218082,98 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ProductArn": {
+                        "ProductArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ProductSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl": {
+            "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": {
+                        "LastUpdateReason": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityControlArn": {
+                            "type": "string"
+                        },
+                        "SecurityControlId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ProductArn"
+                        "Parameters"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
+                        "AWS::SecurityHub::SecurityControl"
                     ],
                     "type": "string"
                 },
@@ -205297,6 +218192,60 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::SecurityControl.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
@@ -205746,6 +218695,112 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityLake::SubscriberNotification": {
+            "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": {
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.NotificationConfiguration"
+                        },
+                        "SubscriberArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationConfiguration",
+                        "SubscriberArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityLake::SubscriberNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationApiKeyName": {
+                    "type": "string"
+                },
+                "AuthorizationApiKeyValue": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "TargetRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "TargetRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpsNotificationConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration"
+                },
+                "SqsNotificationConfiguration": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
@@ -208652,6 +221707,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity.EncryptionConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -208688,6 +221746,24 @@
             ],
             "type": "object"
         },
+        "AWS::StepFunctions::Activity.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::Activity.TagsEntry": {
             "additionalProperties": false,
             "properties": {
@@ -208757,6 +221833,9 @@
                             },
                             "type": "object"
                         },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.EncryptionConfiguration"
+                        },
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
                         },
@@ -208814,6 +221893,24 @@
             },
             "type": "object"
         },
+        "AWS::StepFunctions::StateMachine.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::StateMachine.LogDestination": {
             "additionalProperties": false,
             "properties": {
@@ -209348,6 +222445,12 @@
                         "Name": {
                             "type": "string"
                         },
+                        "ResourcesToReplicateTags": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "RunConfig": {
                             "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
                         },
@@ -209679,6 +222782,9 @@
                             },
                             "type": "array"
                         },
+                        "DatabaseArn": {
+                            "type": "string"
+                        },
                         "Instances": {
                             "items": {
                                 "type": "string"
@@ -210644,6 +223750,9 @@
                         "LoggingRole": {
                             "type": "string"
                         },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
                         "SftpConfig": {
                             "$ref": "#/definitions/AWS::Transfer::Connector.SftpConfig"
                         },
@@ -211345,6 +224454,10 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "DestinationFileLocation",
+                "Type"
+            ],
             "type": "object"
         },
         "AWS::Transfer::Workflow.DeleteStepDetails": {
@@ -211572,13 +224685,93 @@
             "properties": {
                 "CognitoUserPoolConfiguration": {
                     "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                },
+                "OpenIdConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audiences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdPrefix": {
+                    "type": "string"
+                },
+                "GroupConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "TokenSelection": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection"
                 }
             },
             "required": [
-                "CognitoUserPoolConfiguration"
+                "Issuer",
+                "TokenSelection"
             ],
             "type": "object"
         },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupClaim": {
+                    "type": "string"
+                },
+                "GroupEntityType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupClaim",
+                "GroupEntityType"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration"
+                },
+                "IdentityTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::VerifiedPermissions::Policy": {
             "additionalProperties": false,
             "properties": {
@@ -218272,6 +231465,140 @@
             },
             "type": "object"
         },
+        "AWS::WorkSpaces::WorkspacesPool": {
+            "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": {
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.ApplicationSettings"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Capacity": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.Capacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.TimeoutSettings"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "Capacity",
+                        "DirectoryId",
+                        "PoolName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::WorkspacesPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SettingsGroup": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.Capacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredUserSessions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredUserSessions"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.TimeoutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "IdleDisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "MaxUserDurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WorkSpacesThinClient::Environment": {
             "additionalProperties": false,
             "properties": {
@@ -218316,6 +231643,12 @@
                         "DesktopEndpoint": {
                             "type": "string"
                         },
+                        "DeviceCreationTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "KmsKeyArn": {
                             "type": "string"
                         },
@@ -218528,6 +231861,12 @@
                         },
                         "PortalArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -219054,6 +232393,9 @@
                         "CustomerManagedKey": {
                             "type": "string"
                         },
+                        "DeepLinkAllowed": {
+                            "type": "string"
+                        },
                         "DisconnectTimeoutInMinutes": {
                             "type": "number"
                         },
@@ -219781,6 +233123,9 @@
                         {
                             "$ref": "#/definitions/AWS::APS::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ARCZonalShift::ZonalAutoshiftConfiguration"
                         },
@@ -220057,6 +233402,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppSync::SourceApiAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppTest::TestCase"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
                         },
@@ -220066,6 +233414,9 @@
                         {
                             "$ref": "#/definitions/AWS::ApplicationInsights::Application"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Athena::CapacityReservation"
                         },
@@ -220165,12 +233516,30 @@
                         {
                             "$ref": "#/definitions/AWS::Bedrock::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::Guardrail"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::GuardrailVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Prompt"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::PromptVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::BillingConductor::BillingGroup"
                         },
@@ -220234,6 +233603,12 @@
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::Membership"
                         },
@@ -220510,6 +233885,9 @@
                         {
                             "$ref": "#/definitions/AWS::Config::StoredQuery"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::AgentStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::ApprovedOrigin"
                         },
@@ -220573,6 +233951,9 @@
                         {
                             "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::View"
                         },
@@ -220720,18 +234101,30 @@
                         {
                             "$ref": "#/definitions/AWS::DataZone::Environment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentBlueprintConfiguration"
                         },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentProfile"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::GroupProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::Project"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::SubscriptionTarget"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::UserProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Farm"
                         },
@@ -220744,6 +234137,9 @@
                         {
                             "$ref": "#/definitions/AWS::Deadline::MeteredProduct"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Deadline::Monitor"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Queue"
                         },
@@ -221473,6 +234869,9 @@
                         {
                             "$ref": "#/definitions/AWS::Glue::Trigger"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Glue::Workflow"
                         },
@@ -221551,6 +234950,9 @@
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::IPSet"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan"
+                        },
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::Master"
                         },
@@ -221626,6 +235028,9 @@
                         {
                             "$ref": "#/definitions/AWS::IVS::PlaybackRestrictionPolicy"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PublicKey"
+                        },
                         {
                             "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
                         },
@@ -221935,6 +235340,9 @@
                         {
                             "$ref": "#/definitions/AWS::KendraRanking::ExecutionPlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::ResourcePolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kinesis::Stream"
                         },
@@ -222022,6 +235430,9 @@
                         {
                             "$ref": "#/definitions/AWS::Lambda::Version"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::LaunchWizard::Deployment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Lex::Bot"
                         },
@@ -222232,6 +235643,24 @@
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Channel"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Input"
                         },
@@ -222244,6 +235673,15 @@
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Network"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SdiSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SignalMap"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaPackage::Asset"
                         },
@@ -222325,6 +235763,9 @@
                         {
                             "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::EventSubscription"
+                        },
                         {
                             "$ref": "#/definitions/AWS::NeptuneGraph::Graph"
                         },
@@ -222502,6 +235943,12 @@
                         {
                             "$ref": "#/definitions/AWS::PCAConnectorAD::TemplateGroupAccessControlEntry"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Challenge"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
                         },
@@ -222610,6 +236057,24 @@
                         {
                             "$ref": "#/definitions/AWS::Proton::ServiceTemplate"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QLDB::Ledger"
                         },
@@ -222628,6 +236093,9 @@
                         {
                             "$ref": "#/definitions/AWS::QuickSight::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Folder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QuickSight::RefreshSchedule"
                         },
@@ -222955,6 +236423,27 @@
                         {
                             "$ref": "#/definitions/AWS::SES::EmailIdentity"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SES::ReceiptFilter"
                         },
@@ -223036,9 +236525,21 @@
                         {
                             "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::ApplicationAssignment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::Assignment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Instance"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
                         },
@@ -223051,6 +236552,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
                         },
@@ -223087,6 +236591,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::InferenceExperiment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MlflowTrackingServer"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Model"
                         },
@@ -223126,6 +236633,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Space"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::StudioLifecycleConfig"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::UserProfile"
                         },
@@ -223153,18 +236663,33 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::FindingAggregator"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Insight"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::OrganizationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::PolicyAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::SecurityControl"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
@@ -223177,6 +236702,9 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityLake::Subscriber"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
                         },
@@ -223468,6 +236996,9 @@
                         {
                             "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool"
+                        },
                         {
                             "$ref": "#/definitions/AWS::WorkSpacesThinClient::Environment"
                         },
diff --git a/schema/cloudformation.go b/schema/cloudformation.go
index 9e9c4e9be4..344137dc11 100644
--- a/schema/cloudformation.go
+++ b/schema/cloudformation.go
@@ -541,6 +541,9 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.CrlDistributionPointExtensionConfiguration": {
@@ -597,7 +600,6 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "NameAssigner",
                 "PartyName"
             ],
             "type": "object"
@@ -675,6 +677,9 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.OtherName": {
@@ -1232,6 +1237,71 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus": {
+            "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": {
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::ARCZonalShift::ZonalAutoshiftConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -1614,11 +1684,9 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "AutoMinorVersionUpgrade",
                         "BrokerName",
                         "DeploymentMode",
                         "EngineType",
-                        "EngineVersion",
                         "HostInstanceType",
                         "PubliclyAccessible",
                         "Users"
@@ -1867,7 +1935,6 @@ var CloudformationSchema = `{
                     "required": [
                         "Data",
                         "EngineType",
-                        "EngineVersion",
                         "Name"
                     ],
                     "type": "object"
@@ -2041,6 +2108,9 @@ var CloudformationSchema = `{
                         "BuildSpec": {
                             "type": "string"
                         },
+                        "CacheConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.CacheConfig"
+                        },
                         "CustomHeaders": {
                             "type": "string"
                         },
@@ -2170,6 +2240,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Amplify::App.CacheConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Amplify::App.CustomRule": {
             "additionalProperties": false,
             "properties": {
@@ -6489,12 +6568,30 @@ var CloudformationSchema = `{
                             "type": "string"
                         },
                         "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "RequestTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "ResponseParameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameterMap"
+                                }
+                            },
                             "type": "object"
                         },
                         "TemplateSelectionExpression": {
@@ -6544,13 +6641,9 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "Destination",
-                "Source"
-            ],
             "type": "object"
         },
-        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+        "AWS::ApiGatewayV2::Integration.ResponseParameterMap": {
             "additionalProperties": false,
             "properties": {
                 "ResponseParameters": {
@@ -10105,7 +10198,8 @@ var CloudformationSchema = `{
                     "required": [
                         "ApplicationSourceConfig",
                         "Description",
-                        "Name"
+                        "Name",
+                        "Namespace"
                     ],
                     "type": "object"
                 },
@@ -16546,7 +16640,7 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget": {
+        "AWS::AppTest::TestCase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -16581,46 +16675,37 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MaxCapacity": {
-                            "type": "number"
-                        },
-                        "MinCapacity": {
-                            "type": "number"
-                        },
-                        "ResourceId": {
-                            "type": "string"
-                        },
-                        "RoleARN": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ScalableDimension": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ScheduledActions": {
+                        "Steps": {
                             "items": {
-                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                                "$ref": "#/definitions/AWS::AppTest::TestCase.Step"
                             },
                             "type": "array"
                         },
-                        "ServiceNamespace": {
-                            "type": "string"
-                        },
-                        "SuspendedState": {
-                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MaxCapacity",
-                        "MinCapacity",
-                        "ResourceId",
-                        "ScalableDimension",
-                        "ServiceNamespace"
+                        "Name",
+                        "Steps"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                        "AWS::AppTest::TestCase"
                     ],
                     "type": "string"
                 },
@@ -16639,62 +16724,542 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+        "AWS::AppTest::TestCase.Batch": {
             "additionalProperties": false,
             "properties": {
-                "MaxCapacity": {
-                    "type": "number"
+                "BatchJobName": {
+                    "type": "string"
                 },
-                "MinCapacity": {
-                    "type": "number"
+                "BatchJobParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "BatchJobName"
+            ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+        "AWS::AppTest::TestCase.CloudFormationAction": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
+                "ActionType": {
                     "type": "string"
                 },
-                "ScalableTargetAction": {
-                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.CompareAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Input"
                 },
-                "Schedule": {
+                "Output": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Output"
+                }
+            },
+            "required": [
+                "Input"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ccsid": {
                     "type": "string"
                 },
-                "ScheduledActionName": {
+                "Format": {
                     "type": "string"
                 },
-                "StartTime": {
+                "Length": {
+                    "type": "number"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Timezone": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Schedule",
-                "ScheduledActionName"
+                "Ccsid",
+                "Format",
+                "Length",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+        "AWS::AppTest::TestCase.DatabaseCDC": {
             "additionalProperties": false,
             "properties": {
-                "DynamicScalingInSuspended": {
-                    "type": "boolean"
+                "SourceMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.SourceDatabaseMetadata"
                 },
-                "DynamicScalingOutSuspended": {
-                    "type": "boolean"
+                "TargetMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TargetDatabaseMetadata"
+                }
+            },
+            "required": [
+                "SourceMetadata",
+                "TargetMetadata"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.FileMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppTest::TestCase.DataSet"
+                    },
+                    "type": "array"
                 },
-                "ScheduledScalingSuspended": {
+                "DatabaseCDC": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.DatabaseCDC"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.InputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.InputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.FileMetadata"
+                },
+                "SourceLocation": {
+                    "type": "string"
+                },
+                "TargetLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileMetadata",
+                "SourceLocation",
+                "TargetLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2ManagedActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ForceStop": {
                     "type": "boolean"
+                },
+                "ImportDataSetLocation": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalingPolicy": {
+        "AWS::AppTest::TestCase.M2ManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2NonManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionType"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DmsTaskArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Batch": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Batch"
+                },
+                "Tn3270": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TN3270"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.OutputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.OutputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.ResourceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CloudFormationAction"
+                },
+                "M2ManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedApplicationAction"
+                },
+                "M2NonManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2NonManagedApplicationAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Script": {
+            "additionalProperties": false,
+            "properties": {
+                "ScriptLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScriptLocation",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.SourceDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Step": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.StepAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.StepAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CompareAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CompareAction"
+                },
+                "MainframeAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeAction"
+                },
+                "ResourceAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.ResourceAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TN3270": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Script": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Script"
+                }
+            },
+            "required": [
+                "Script"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TargetDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TestCaseLatestVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Status",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "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": {
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MinCapacity": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScheduledActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "SuspendedState": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        }
+                    },
+                    "required": [
+                        "MaxCapacity",
+                        "MinCapacity",
+                        "ResourceId",
+                        "ScalableDimension",
+                        "ServiceNamespace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "ScalableTargetAction": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                },
+                "Schedule": {
+                    "type": "string"
+                },
+                "ScheduledActionName": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule",
+                "ScheduledActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicScalingInSuspended": {
+                    "type": "boolean"
+                },
+                "DynamicScalingOutSuspended": {
+                    "type": "boolean"
+                },
+                "ScheduledScalingSuspended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17467,7 +18032,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation": {
+        "AWS::ApplicationSignals::ServiceLevelObjective": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17502,31 +18067,36 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CapacityAssignmentConfiguration": {
-                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Goal": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Goal"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "RequestBasedSli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli"
+                        },
+                        "Sli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Sli"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TargetDpus": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "Name",
-                        "TargetDpus"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Athena::CapacityReservation"
+                        "AWS::ApplicationSignals::ServiceLevelObjective"
                     ],
                     "type": "string"
                 },
@@ -17545,37 +18115,378 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval": {
             "additionalProperties": false,
             "properties": {
-                "WorkgroupNames": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Duration",
+                "DurationUnit",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Goal": {
+            "additionalProperties": false,
+            "properties": {
+                "AttainmentGoal": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Interval"
+                },
+                "WarningThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Interval": {
+            "additionalProperties": false,
+            "properties": {
+                "CalendarInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval"
+                },
+                "RollingInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Dimension"
                     },
                     "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "WorkgroupNames"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricStat": {
             "additionalProperties": false,
             "properties": {
-                "CapacityAssignments": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "BadCountMetric": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "GoodCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "RequestBasedSliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric"
+                }
+            },
+            "required": [
+                "RequestBasedSliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "MonitoredRequestCountMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "TotalRequestCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
                     },
                     "type": "array"
                 }
             },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                }
+            },
             "required": [
-                "CapacityAssignments"
+                "Duration",
+                "DurationUnit"
             ],
             "type": "object"
         },
-        "AWS::Athena::DataCatalog": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.Sli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "SliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.SliMetric"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricThreshold",
+                "SliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.SliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "PeriodSeconds": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation": {
+            "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": {
+                        "CapacityAssignmentConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetDpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetDpus"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkgroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WorkgroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityAssignments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CapacityAssignments"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -19184,6 +20095,12 @@ var CloudformationSchema = `{
                 "MetricName": {
                     "type": "string"
                 },
+                "Metrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery"
+                    },
+                    "type": "array"
+                },
                 "Namespace": {
                     "type": "string"
                 },
@@ -19194,11 +20111,6 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "MetricName",
-                "Namespace",
-                "Statistic"
-            ],
             "type": "object"
         },
         "AWS::AutoScaling::ScalingPolicy.Metric": {
@@ -19483,179 +20395,222 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::ScheduledAction": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Id": {
                     "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "DesiredCapacity": {
-                            "type": "number"
-                        },
-                        "EndTime": {
-                            "type": "string"
-                        },
-                        "MaxSize": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "Recurrence": {
-                            "type": "string"
-                        },
-                        "StartTime": {
-                            "type": "string"
-                        },
-                        "TimeZone": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::ScheduledAction"
-                    ],
+                "Label": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat": {
             "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "InstanceReusePolicy": {
-                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
-                        },
-                        "MaxGroupPreparedCapacity": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "PoolState": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
+                "Metric": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.Metric"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::WarmPool"
-                    ],
+                "Stat": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Metric",
+                "Stat"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "ReuseOnScaleIn": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::AutoScalingPlans::ScalingPlan": {
+        "AWS::AutoScaling::ScheduledAction": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "number"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Recurrence": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "InstanceReusePolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
+                        },
+                        "MaxGroupPreparedCapacity": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "PoolState": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::WarmPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ReuseOnScaleIn": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20053,6 +21008,9 @@ var CloudformationSchema = `{
         "AWS::B2BI::Capability.EdiConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CapabilityDirection": {
+                    "type": "string"
+                },
                 "InputLocation": {
                     "$ref": "#/definitions/AWS::B2BI::Capability.S3Location"
                 },
@@ -20151,6 +21109,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "CapabilityOptions": {
+                            "$ref": "#/definitions/AWS::B2BI::Partnership.CapabilityOptions"
+                        },
                         "Email": {
                             "type": "string"
                         },
@@ -20171,6 +21132,7 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
+                        "Capabilities",
                         "Email",
                         "Name",
                         "ProfileId"
@@ -20198,93 +21160,112 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::B2BI::Profile": {
+        "AWS::B2BI::Partnership.CapabilityOptions": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "OutboundEdi": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.OutboundEdiOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.OutboundEdiOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "X12": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Envelope"
+                }
+            },
+            "required": [
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Delimiters": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentSeparator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DataElementSeparator": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "SegmentTerminator": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Envelope": {
+            "additionalProperties": false,
+            "properties": {
+                "Common": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12OutboundEdiHeaders"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12FunctionalGroupHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationReceiverCode": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "ApplicationSenderCode": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "BusinessName": {
-                            "type": "string"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "Logging": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Phone": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "BusinessName",
-                        "Logging",
-                        "Name",
-                        "Phone"
-                    ],
-                    "type": "object"
+                "ResponsibleAgencyCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12InterchangeControlHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "AcknowledgmentRequestedCode": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::B2BI::Profile"
-                    ],
+                "ReceiverId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ReceiverIdQualifier": {
+                    "type": "string"
+                },
+                "RepetitionSeparator": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "SenderIdQualifier": {
+                    "type": "string"
+                },
+                "UsageIndicatorCode": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer": {
+        "AWS::B2BI::Partnership.X12OutboundEdiHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiters": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Delimiters"
+                },
+                "FunctionalGroupHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12FunctionalGroupHeaders"
+                },
+                "InterchangeControlHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12InterchangeControlHeaders"
+                },
+                "ValidateEdi": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Profile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20319,21 +21300,107 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EdiType": {
-                            "$ref": "#/definitions/AWS::B2BI::Transformer.EdiType"
+                        "BusinessName": {
+                            "type": "string"
                         },
-                        "FileFormat": {
+                        "Email": {
                             "type": "string"
                         },
-                        "MappingTemplate": {
+                        "Logging": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "SampleDocument": {
+                        "Phone": {
                             "type": "string"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BusinessName",
+                        "Logging",
+                        "Name",
+                        "Phone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::B2BI::Profile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer": {
+            "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": {
+                        "InputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.InputConversion"
+                        },
+                        "Mapping": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.Mapping"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.OutputConversion"
+                        },
+                        "SampleDocuments": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocuments"
+                        },
                         "Status": {
                             "type": "string"
                         },
@@ -20345,9 +21412,6 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "EdiType",
-                        "FileFormat",
-                        "MappingTemplate",
                         "Name",
                         "Status"
                     ],
@@ -20374,15 +21438,91 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer.EdiType": {
+        "AWS::B2BI::Transformer.FormatOptions": {
             "additionalProperties": false,
             "properties": {
-                "X12Details": {
+                "X12": {
                     "$ref": "#/definitions/AWS::B2BI::Transformer.X12Details"
                 }
             },
             "required": [
-                "X12Details"
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.InputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "FromFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FromFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.Mapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Template": {
+                    "type": "string"
+                },
+                "TemplateLanguage": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateLanguage"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.OutputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "ToFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ToFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocumentKeys": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Output": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Keys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocumentKeys"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Keys"
             ],
             "type": "object"
         },
@@ -21413,6 +22553,9 @@ var CloudformationSchema = `{
                         "ScheduleExpressionTimezone": {
                             "type": "string"
                         },
+                        "ScheduleStatus": {
+                            "type": "string"
+                        },
                         "StartWindowHours": {
                             "type": "number"
                         },
@@ -21741,6 +22884,9 @@ var CloudformationSchema = `{
                         "ComputeResources": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
                         },
+                        "Context": {
+                            "type": "string"
+                        },
                         "EksConfiguration": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.EksConfiguration"
                         },
@@ -22618,6 +23764,9 @@ var CloudformationSchema = `{
                 "EcsProperties": {
                     "$ref": "#/definitions/AWS::Batch::JobDefinition.EcsProperties"
                 },
+                "EksProperties": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EksProperties"
+                },
                 "InstanceTypes": {
                     "items": {
                         "type": "string"
@@ -23212,6 +24361,9 @@ var CloudformationSchema = `{
                         "FoundationModel": {
                             "type": "string"
                         },
+                        "GuardrailConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.GuardrailConfiguration"
+                        },
                         "IdleSessionTTLInSeconds": {
                             "type": "number"
                         },
@@ -23290,13 +24442,13 @@ var CloudformationSchema = `{
         "AWS::Bedrock::Agent.ActionGroupExecutor": {
             "additionalProperties": false,
             "properties": {
+                "CustomControl": {
+                    "type": "string"
+                },
                 "Lambda": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Lambda"
-            ],
             "type": "object"
         },
         "AWS::Bedrock::Agent.AgentActionGroup": {
@@ -23317,6 +24469,9 @@ var CloudformationSchema = `{
                 "Description": {
                     "type": "string"
                 },
+                "FunctionSchema": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.FunctionSchema"
+                },
                 "ParentActionGroupSignature": {
                     "type": "string"
                 },
@@ -23348,367 +24503,154 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.InferenceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumLength": {
-                    "type": "number"
-                },
-                "StopSequences": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Temperature": {
-                    "type": "number"
-                },
-                "TopK": {
-                    "type": "number"
-                },
-                "TopP": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Agent.PromptConfiguration": {
+        "AWS::Bedrock::Agent.Function": {
             "additionalProperties": false,
             "properties": {
-                "BasePromptTemplate": {
-                    "type": "string"
-                },
-                "InferenceConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
-                },
-                "ParserMode": {
-                    "type": "string"
-                },
-                "PromptCreationMode": {
+                "Description": {
                     "type": "string"
                 },
-                "PromptState": {
+                "Name": {
                     "type": "string"
                 },
-                "PromptType": {
-                    "type": "string"
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.ParameterDetail"
+                        }
+                    },
+                    "type": "object"
                 }
             },
+            "required": [
+                "Name"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
+        "AWS::Bedrock::Agent.FunctionSchema": {
             "additionalProperties": false,
             "properties": {
-                "OverrideLambda": {
-                    "type": "string"
-                },
-                "PromptConfigurations": {
+                "Functions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.Function"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PromptConfigurations"
+                "Functions"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.S3Identifier": {
+        "AWS::Bedrock::Agent.GuardrailConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "S3BucketName": {
+                "GuardrailIdentifier": {
                     "type": "string"
                 },
-                "S3ObjectKey": {
+                "GuardrailVersion": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias": {
+        "AWS::Bedrock::Agent.InferenceConfiguration": {
             "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"
+                "MaximumLength": {
+                    "type": "number"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "AgentAliasName": {
-                            "type": "string"
-                        },
-                        "AgentId": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "RoutingConfiguration": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "AgentAliasName",
-                        "AgentId"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::AgentAlias"
-                    ],
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+        "AWS::Bedrock::Agent.ParameterDetail": {
             "additionalProperties": false,
             "properties": {
-                "EndDate": {
+                "Description": {
                     "type": "string"
                 },
-                "RoutingConfiguration": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                    },
-                    "type": "array"
+                "Required": {
+                    "type": "boolean"
                 },
-                "StartDate": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
-            "additionalProperties": false,
-            "properties": {
-                "AgentVersion": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "AgentVersion"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource": {
+        "AWS::Bedrock::Agent.PromptConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "BasePromptTemplate": {
                     "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": {
-                        "DataSourceConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "KnowledgeBaseId": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ServerSideEncryptionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
-                        },
-                        "VectorIngestionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
-                        }
-                    },
-                    "required": [
-                        "DataSourceConfiguration",
-                        "KnowledgeBaseId",
-                        "Name"
-                    ],
-                    "type": "object"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::DataSource"
-                    ],
+                "ParserMode": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingStrategy": {
+                "PromptCreationMode": {
                     "type": "string"
                 },
-                "FixedSizeChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
-                }
-            },
-            "required": [
-                "ChunkingStrategy"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3Configuration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
-                },
-                "Type": {
+                "PromptState": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "S3Configuration",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxTokens": {
-                    "type": "number"
                 },
-                "OverlapPercentage": {
-                    "type": "number"
+                "PromptType": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "MaxTokens",
-                "OverlapPercentage"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BucketArn": {
+                "OverrideLambda": {
                     "type": "string"
                 },
-                "InclusionPrefixes": {
+                "PromptConfigurations": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "BucketArn"
+                "PromptConfigurations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+        "AWS::Bedrock::Agent.S3Identifier": {
             "additionalProperties": false,
             "properties": {
-                "KmsKeyArn": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectKey": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Guardrail": {
+        "AWS::Bedrock::AgentAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -23743,50 +24685,155 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BlockedInputMessaging": {
+                        "AgentAliasName": {
                             "type": "string"
                         },
-                        "BlockedOutputsMessaging": {
+                        "AgentId": {
                             "type": "string"
                         },
-                        "ContentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
-                            "type": "string"
+                        "RoutingConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                            },
+                            "type": "array"
                         },
-                        "Name": {
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AgentAliasName",
+                        "AgentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Bedrock::AgentAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EndDate": {
+                    "type": "string"
+                },
+                "RoutingConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                    },
+                    "type": "array"
+                },
+                "StartDate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SensitiveInformationPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
-                        },
-                        "Tags": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDeletionPolicy": {
+                            "type": "string"
                         },
-                        "TopicPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
                         },
-                        "WordPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KnowledgeBaseId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
+                        },
+                        "VectorIngestionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
                         }
                     },
                     "required": [
-                        "BlockedInputMessaging",
-                        "BlockedOutputsMessaging",
+                        "DataSourceConfiguration",
+                        "KnowledgeBaseId",
                         "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::Guardrail"
+                        "AWS::Bedrock::DataSource"
                     ],
                     "type": "string"
                 },
@@ -23805,46 +24852,144 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
+        "AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "InputStrength": {
+                "ModelArn": {
                     "type": "string"
                 },
-                "OutputStrength": {
+                "ParsingPrompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingPrompt"
+                }
+            },
+            "required": [
+                "ModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingStrategy": {
+                    "type": "string"
+                },
+                "FixedSizeChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
+                },
+                "HierarchicalChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration"
+                },
+                "SemanticChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SemanticChunkingConfiguration"
+                }
+            },
+            "required": [
+                "ChunkingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
+                "HostType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostType",
+                "HostUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.CrawlFilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PatternObjectFilter": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilterConfiguration"
+                },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InputStrength",
-                "OutputStrength",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
+        "AWS::Bedrock::DataSource.CustomTransformationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FiltersConfig": {
+                "IntermediateStorage": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.IntermediateStorage"
+                },
+                "Transformations": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.Transformation"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "FiltersConfig"
+                "IntermediateStorage",
+                "Transformations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointDataSourceConfiguration"
+                },
                 "Type": {
                     "type": "string"
+                },
+                "WebConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebDataSourceConfiguration"
                 }
             },
             "required": [
@@ -23852,135 +24997,438 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "Type": {
-                    "type": "string"
+                "OverlapPercentage": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Action",
-                "Type"
+                "MaxTokens",
+                "OverlapPercentage"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.RegexConfig": {
+        "AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "LevelConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration"
+                    },
+                    "type": "array"
                 },
-                "Description": {
-                    "type": "string"
+                "OverlapTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LevelConfigurations",
+                "OverlapTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.IntermediateStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockFoundationModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration"
                 },
-                "Name": {
+                "ParsingStrategy": {
                     "type": "string"
-                },
-                "Pattern": {
+                }
+            },
+            "required": [
+                "ParsingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingPrompt": {
+            "additionalProperties": false,
+            "properties": {
+                "ParsingPromptText": {
                     "type": "string"
                 }
             },
             "required": [
-                "Action",
-                "Name",
-                "Pattern"
+                "ParsingPromptText"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilter": {
             "additionalProperties": false,
             "properties": {
-                "PiiEntitiesConfig": {
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "RegexesConfig": {
+                "InclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "ObjectType": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ObjectType"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilterConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Definition": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Filters"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
                     "type": "string"
                 },
-                "Examples": {
+                "BucketOwnerAccountId": {
+                    "type": "string"
+                },
+                "InclusionPrefixes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "BucketArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "URI"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration"
                 },
-                "Name": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
                     "type": "string"
                 },
-                "Type": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "HostUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Definition",
-                "Name",
-                "Type"
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostUrl"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
+        "AWS::Bedrock::DataSource.SeedUrl": {
             "additionalProperties": false,
             "properties": {
-                "TopicsConfig": {
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SemanticChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BreakpointPercentileThreshold": {
+                    "type": "number"
+                },
+                "BufferSize": {
+                    "type": "number"
+                },
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BreakpointPercentileThreshold",
+                "BufferSize",
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                },
+                "HostType": {
+                    "type": "string"
+                },
+                "SiteUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "TenantId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TopicsConfig"
+                "AuthType",
+                "CredentialsSecretArn",
+                "Domain",
+                "HostType",
+                "SiteUrls"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordConfig": {
+        "AWS::Bedrock::DataSource.Transformation": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
+                "StepToApply": {
                     "type": "string"
+                },
+                "TransformationFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationFunction"
                 }
             },
             "required": [
-                "Text"
+                "StepToApply",
+                "TransformationFunction"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+        "AWS::Bedrock::DataSource.TransformationFunction": {
             "additionalProperties": false,
             "properties": {
-                "ManagedWordListsConfig": {
+                "TransformationLambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationLambdaConfiguration"
+                }
+            },
+            "required": [
+                "TransformationLambdaConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.TransformationLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.UrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.SeedUrl"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
                 },
-                "WordsConfig": {
+                "CustomTransformationConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CustomTransformationConfiguration"
+                },
+                "ParsingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerLimits": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerLimits"
+                },
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionFilters": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "Scope": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase": {
+        "AWS::Bedrock::DataSource.WebCrawlerLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "UrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.UrlConfiguration"
+                }
+            },
+            "required": [
+                "UrlConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24015,20 +25463,35 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "KnowledgeBaseConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDefinition"
                         },
-                        "Name": {
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.S3Location"
+                        },
+                        "DefinitionString": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StorageConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
                         },
                         "Tags": {
                             "additionalProperties": true,
@@ -24038,19 +25501,26 @@ var CloudformationSchema = `{
                                 }
                             },
                             "type": "object"
+                        },
+                        "TestAliasTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "KnowledgeBaseConfiguration",
-                        "Name",
-                        "RoleArn",
-                        "StorageConfiguration"
+                        "ExecutionRoleArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::KnowledgeBase"
+                        "AWS::Bedrock::Flow"
                     ],
                     "type": "string"
                 },
@@ -24069,187 +25539,517 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "AgentAliasArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.ConditionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
                     "type": "string"
                 },
-                "VectorKnowledgeBaseConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                "Name": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "VectorKnowledgeBaseConfiguration"
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+        "AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CollectionArn": {
+                "Condition": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnectionConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                "Name": {
+                    "type": "string"
                 },
-                "VectorIndexName": {
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "CollectionArn",
-                "FieldMapping",
-                "VectorIndexName"
+                "Name",
+                "Source",
+                "Target",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+        "AWS::Bedrock::Flow.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
-                    "type": "string"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration"
                 },
-                "TextField": {
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
                     "type": "string"
                 },
-                "VectorField": {
+                "TargetInput": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField",
-                "VectorField"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+        "AWS::Bedrock::Flow.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionString": {
+                "Connections": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnection"
+                    },
+                    "type": "array"
+                },
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNode"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeConfiguration"
+                },
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "CredentialsSecretArn": {
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeOutput"
+                    },
+                    "type": "array"
+                },
+                "Type": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.AgentFlowNodeConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                "Collector": {
+                    "type": "object"
                 },
-                "Namespace": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.ConditionFlowNodeConfiguration"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Iterator": {
+                    "type": "object"
+                },
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration"
+                },
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "ConnectionString",
-                "CredentialsSecretArn",
-                "FieldMapping"
+                "Expression",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+        "AWS::Bedrock::Flow.FlowNodeOutput": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "Name": {
                     "type": "string"
                 },
-                "TextField": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+        "AWS::Bedrock::Flow.FlowValidation": {
             "additionalProperties": false,
             "properties": {
-                "CredentialsSecretArn": {
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
                     "type": "string"
                 },
-                "DatabaseName": {
+                "ModelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LexFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                "LocaleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BotAliasArn",
+                "LocaleId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInferenceConfiguration"
                 },
-                "ResourceArn": {
+                "ModelId": {
                     "type": "string"
                 },
-                "TableName": {
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "CredentialsSecretArn",
-                "DatabaseName",
-                "FieldMapping",
-                "ResourceArn",
-                "TableName"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+        "AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "PromptArn": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration"
                 },
-                "PrimaryKeyField": {
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "TextField": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "VectorField": {
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "PrimaryKeyField",
-                "TextField",
-                "VectorField"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+        "AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "OpensearchServerlessConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
-                },
-                "PineconeConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
                 },
-                "RdsConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "Type": {
+                "Version": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.StorageFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "EmbeddingModelArn": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.StorageFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "EmbeddingModelArn"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup": {
+        "AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24284,39 +26084,41 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountGrouping": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
-                        },
-                        "ComputationPreference": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
                         },
-                        "PrimaryAccountId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "RoutingConfiguration": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "AccountGrouping",
-                        "ComputationPreference",
+                        "FlowArn",
                         "Name",
-                        "PrimaryAccountId"
+                        "RoutingConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::BillingGroup"
+                        "AWS::Bedrock::FlowAlias"
                     ],
                     "type": "string"
                 },
@@ -24335,37 +26137,16 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoAssociate": {
-                    "type": "boolean"
-                },
-                "LinkedAccountIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "LinkedAccountIds"
-            ],
-            "type": "object"
-        },
-        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+        "AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem": {
             "additionalProperties": false,
             "properties": {
-                "PricingPlanArn": {
+                "FlowVersion": {
                     "type": "string"
                 }
             },
-            "required": [
-                "PricingPlanArn"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem": {
+        "AWS::Bedrock::FlowVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24400,40 +26181,21 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountId": {
-                            "type": "string"
-                        },
-                        "BillingGroupArn": {
-                            "type": "string"
-                        },
-                        "BillingPeriodRange": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
-                        },
-                        "CustomLineItemChargeDetails": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
                     "required": [
-                        "BillingGroupArn",
-                        "Name"
+                        "FlowArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::CustomLineItem"
+                        "AWS::Bedrock::FlowVersion"
                     ],
                     "type": "string"
                 },
@@ -24452,557 +26214,486 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+        "AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ExclusiveEndBillingPeriod": {
-                    "type": "string"
-                },
-                "InclusiveStartBillingPeriod": {
+                "AgentAliasArn": {
                     "type": "string"
                 }
             },
-            "type": "object"
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+        "AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Flat": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
-                },
-                "LineItemFilters": {
+                "Conditions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowCondition"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
                 },
-                "Percentage": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnectionConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
                 },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
+                "Name",
+                "Source",
+                "Target",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ChargeValue": {
-                    "type": "number"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration"
+                },
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
+                    "type": "string"
+                },
+                "TargetInput": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ChargeValue"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ChildAssociatedResources": {
+                "Connections": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnection"
                     },
                     "type": "array"
                 },
-                "PercentageValue": {
-                    "type": "number"
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNode"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "PercentageValue"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+        "AWS::Bedrock::FlowVersion.FlowNode": {
             "additionalProperties": false,
             "properties": {
-                "Attribute": {
-                    "type": "string"
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeConfiguration"
                 },
-                "MatchOption": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Values": {
+                "Outputs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeOutput"
                     },
                     "type": "array"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Attribute",
-                "MatchOption",
-                "Values"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingPlan": {
+        "AWS::Bedrock::FlowVersion.FlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Collector": {
+                    "type": "object"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration"
                 },
-                "Metadata": {
+                "Input": {
                     "type": "object"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "PricingRuleArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name"
-                    ],
+                "Iterator": {
                     "type": "object"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingPlan"
-                    ],
-                    "type": "string"
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule": {
+        "AWS::Bedrock::FlowVersion.FlowNodeInput": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Name": {
                     "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": {
-                        "BillingEntity": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ModifierPercentage": {
-                            "type": "number"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Operation": {
-                            "type": "string"
-                        },
-                        "Scope": {
-                            "type": "string"
-                        },
-                        "Service": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Tiering": {
-                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "UsageType": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "Scope",
-                        "Type"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingRule"
-                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowNodeOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.FreeTier": {
+        "AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Activated": {
-                    "type": "boolean"
+                "KnowledgeBaseId": {
+                    "type": "string"
+                },
+                "ModelId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Activated"
+                "KnowledgeBaseId"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.Tiering": {
+        "AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FreeTier": {
-                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
+                "LambdaArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "LambdaArn"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::Budget": {
+        "AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration": {
             "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": {
-                        "Budget": {
-                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
-                        },
-                        "NotificationsWithSubscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Budget"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Budgets::Budget"
-                    ],
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "LocaleId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "BotAliasArn",
+                "LocaleId"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.AutoAdjustData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustType": {
-                    "type": "string"
-                },
-                "HistoricalOptions": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration"
                 }
             },
             "required": [
-                "AutoAdjustType"
+                "SourceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.BudgetData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustData": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
-                },
-                "BudgetLimit": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
-                },
-                "BudgetName": {
-                    "type": "string"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInferenceConfiguration"
                 },
-                "BudgetType": {
+                "ModelId": {
                     "type": "string"
                 },
-                "CostFilters": {
-                    "type": "object"
-                },
-                "CostTypes": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
-                },
-                "PlannedBudgetLimits": {
-                    "type": "object"
-                },
-                "TimePeriod": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptTemplateConfiguration"
                 },
-                "TimeUnit": {
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "BudgetType",
-                "TimeUnit"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.CostTypes": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "IncludeCredit": {
-                    "type": "boolean"
-                },
-                "IncludeDiscount": {
-                    "type": "boolean"
-                },
-                "IncludeOtherSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeRecurring": {
-                    "type": "boolean"
-                },
-                "IncludeRefund": {
-                    "type": "boolean"
-                },
-                "IncludeSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeSupport": {
-                    "type": "boolean"
-                },
-                "IncludeTax": {
-                    "type": "boolean"
-                },
-                "IncludeUpfront": {
-                    "type": "boolean"
-                },
-                "UseAmortized": {
-                    "type": "boolean"
+                "PromptArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration"
                 },
-                "UseBlended": {
-                    "type": "boolean"
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration"
                 }
             },
             "type": "object"
         },
-        "AWS::Budgets::Budget.HistoricalOptions": {
+        "AWS::Bedrock::FlowVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BudgetAdjustmentPeriod": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "BudgetAdjustmentPeriod"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Notification": {
+        "AWS::Bedrock::FlowVersion.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "ComparisonOperator": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "NotificationType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Threshold": {
+                "Temperature": {
                     "type": "number"
                 },
-                "ThresholdType": {
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ComparisonOperator",
-                "NotificationType",
-                "Threshold"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Notification": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
-                },
-                "Subscribers": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
-                    },
-                    "type": "array"
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Notification",
-                "Subscribers"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Spend": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Amount": {
-                    "type": "number"
-                },
-                "Unit": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Amount",
-                "Unit"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Subscriber": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "SubscriptionType": {
-                    "type": "string"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Address",
-                "SubscriptionType"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.TimePeriod": {
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "End": {
+                "BucketName": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInputVariable"
+                    },
+                    "type": "array"
                 },
-                "Start": {
+                "Text": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Text"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction": {
+        "AWS::Bedrock::Guardrail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25037,48 +26728,53 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionThreshold": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
-                        },
-                        "ActionType": {
+                        "BlockedInputMessaging": {
                             "type": "string"
                         },
-                        "ApprovalModel": {
+                        "BlockedOutputsMessaging": {
                             "type": "string"
                         },
-                        "BudgetName": {
-                            "type": "string"
+                        "ContentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
                         },
-                        "Definition": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        "ContextualGroundingPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig"
                         },
-                        "ExecutionRoleArn": {
+                        "Description": {
                             "type": "string"
                         },
-                        "NotificationType": {
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Subscribers": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SensitiveInformationPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
+                        },
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TopicPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        },
+                        "WordPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
                         }
                     },
                     "required": [
-                        "ActionThreshold",
-                        "ActionType",
-                        "BudgetName",
-                        "Definition",
-                        "ExecutionRoleArn",
-                        "NotificationType",
-                        "Subscribers"
+                        "BlockedInputMessaging",
+                        "BlockedOutputsMessaging",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Budgets::BudgetsAction"
+                        "AWS::Bedrock::Guardrail"
                     ],
                     "type": "string"
                 },
@@ -25097,113 +26793,88 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "InputStrength": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "number"
+                "OutputStrength": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Value"
+                "InputStrength",
+                "OutputStrength",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Definition": {
+        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "IamActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
-                },
-                "ScpActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
-                },
-                "SsmActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                "FiltersConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "FiltersConfig"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Groups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Threshold": {
+                    "type": "number"
                 },
-                "PolicyArn": {
+                "Type": {
                     "type": "string"
-                },
-                "Roles": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Users": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
             "required": [
-                "PolicyArn"
+                "Threshold",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "PolicyId": {
-                    "type": "string"
-                },
-                "TargetIds": {
+                "FiltersConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PolicyId",
-                "TargetIds"
+                "FiltersConfig"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "Subtype": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InstanceIds",
-                "Region",
-                "Subtype"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Subscriber": {
+        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
+                "Action": {
                     "type": "string"
                 },
                 "Type": {
@@ -25211,239 +26882,124 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Address",
+                "Action",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor": {
+        "AWS::Bedrock::Guardrail.RegexConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Action": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Description": {
                     "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": {
-                        "MonitorDimension": {
-                            "type": "string"
-                        },
-                        "MonitorName": {
-                            "type": "string"
-                        },
-                        "MonitorSpecification": {
-                            "type": "string"
-                        },
-                        "MonitorType": {
-                            "type": "string"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "MonitorName",
-                        "MonitorType"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalyMonitor"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Pattern": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Action",
+                "Name",
+                "Pattern"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor.ResourceTag": {
+        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
+                "PiiEntitiesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                    },
+                    "type": "array"
                 },
-                "Value": {
-                    "type": "string"
+                "RegexesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription": {
+        "AWS::Bedrock::Guardrail.TopicConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Definition": {
                     "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": {
-                        "Frequency": {
-                            "type": "string"
-                        },
-                        "MonitorArnList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
-                            },
-                            "type": "array"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
-                            },
-                            "type": "array"
-                        },
-                        "SubscriptionName": {
-                            "type": "string"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdExpression": {
-                            "type": "string"
-                        }
+                "Examples": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Frequency",
-                        "MonitorArnList",
-                        "Subscribers",
-                        "SubscriptionName"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalySubscription"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Definition",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.ResourceTag": {
+        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "TopicsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "TopicsConfig"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.Subscriber": {
+        "AWS::Bedrock::Guardrail.WordConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "Status": {
-                    "type": "string"
-                },
-                "Type": {
+                "Text": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::CE::CostCategory": {
+        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ManagedWordListsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                    },
+                    "type": "array"
+                },
+                "WordsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::GuardrailVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25478,32 +27034,21 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultValue": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RuleVersion": {
-                            "type": "string"
-                        },
-                        "Rules": {
+                        "Description": {
                             "type": "string"
                         },
-                        "SplitChargeRules": {
+                        "GuardrailIdentifier": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RuleVersion",
-                        "Rules"
+                        "GuardrailIdentifier"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CE::CostCategory"
+                        "AWS::Bedrock::GuardrailVersion"
                     ],
                     "type": "string"
                 },
@@ -25522,7 +27067,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CUR::ReportDefinition": {
+        "AWS::Bedrock::KnowledgeBase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25557,65 +27102,42 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalArtifacts": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AdditionalSchemaElements": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BillingViewArn": {
-                            "type": "string"
-                        },
-                        "Compression": {
-                            "type": "string"
-                        },
-                        "Format": {
-                            "type": "string"
-                        },
-                        "RefreshClosedReports": {
-                            "type": "boolean"
-                        },
-                        "ReportName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ReportVersioning": {
-                            "type": "string"
+                        "KnowledgeBaseConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
                         },
-                        "S3Bucket": {
+                        "Name": {
                             "type": "string"
                         },
-                        "S3Prefix": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "S3Region": {
-                            "type": "string"
+                        "StorageConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
                         },
-                        "TimeUnit": {
-                            "type": "string"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "Compression",
-                        "Format",
-                        "RefreshClosedReports",
-                        "ReportName",
-                        "ReportVersioning",
-                        "S3Bucket",
-                        "S3Prefix",
-                        "S3Region",
-                        "TimeUnit"
+                        "KnowledgeBaseConfiguration",
+                        "Name",
+                        "RoleArn",
+                        "StorageConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CUR::ReportDefinition"
+                        "AWS::Bedrock::KnowledgeBase"
                     ],
                     "type": "string"
                 },
@@ -25634,92 +27156,266 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace": {
+        "AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Dimensions": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockEmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "VectorKnowledgeBaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                }
+            },
+            "required": [
+                "Type",
+                "VectorKnowledgeBaseConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionName": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "CredentialsSecretArn": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "KeyspaceName": {
-                            "type": "string"
-                        },
-                        "ReplicationSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "type": "object"
+                "Endpoint": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Cassandra::Keyspace"
-                    ],
+                "EndpointServiceName": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping"
+                },
+                "VectorIndexName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "CollectionName",
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "Endpoint",
+                "FieldMapping",
+                "VectorIndexName"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "RegionList": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "MetadataField": {
+                    "type": "string"
                 },
-                "ReplicationStrategy": {
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
                     "type": "string"
                 }
             },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                },
+                "VectorIndexName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionArn",
+                "FieldMapping",
+                "VectorIndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionString": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectionString",
+                "CredentialsSecretArn",
+                "FieldMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "FieldMapping",
+                "ResourceArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "PrimaryKeyField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "PrimaryKeyField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MongoDbAtlasConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration"
+                },
+                "OpensearchServerlessConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
+                },
+                "PineconeConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                },
+                "RdsConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EmbeddingModelArn": {
+                    "type": "string"
+                },
+                "EmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration"
+                }
+            },
+            "required": [
+                "EmbeddingModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Prompt": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25754,70 +27450,42 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoScalingSpecifications": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
-                        },
-                        "BillingMode": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
-                        },
-                        "ClientSideTimestampsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ClusteringKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
-                            },
-                            "type": "array"
-                        },
-                        "DefaultTimeToLive": {
-                            "type": "number"
-                        },
-                        "EncryptionSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
-                        },
-                        "KeyspaceName": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "PartitionKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
-                        },
-                        "PointInTimeRecoveryEnabled": {
-                            "type": "boolean"
-                        },
-                        "RegularColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
+                        "DefaultVariant": {
+                            "type": "string"
                         },
-                        "ReplicaSpecifications": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
                         },
-                        "TableName": {
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptVariant"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "KeyspaceName",
-                        "PartitionKeyColumns"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cassandra::Table"
+                        "AWS::Bedrock::Prompt"
                     ],
                     "type": "string"
                 },
@@ -25836,162 +27504,126 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.AutoScalingSetting": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoScalingDisabled": {
-                    "type": "boolean"
-                },
-                "MaximumUnits": {
-                    "type": "number"
-                },
-                "MinimumUnits": {
-                    "type": "number"
-                },
-                "ScalingPolicy": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.AutoScalingSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                },
-                "WriteCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.BillingMode": {
+        "AWS::Bedrock::Prompt.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Mode": {
-                    "type": "string"
-                },
-                "ProvisionedThroughput": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "Mode"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+        "AWS::Bedrock::Prompt.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "Column": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                },
-                "OrderBy": {
+                "Name": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Column"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.Column": {
+        "AWS::Bedrock::Prompt.PromptModelInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "ColumnType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnType"
-            ],
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.EncryptionSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "EncryptionType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "KmsKeyIdentifier": {
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "EncryptionType"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ProvisionedThroughput": {
+        "AWS::Bedrock::Prompt.PromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityUnits": {
-                    "type": "number"
-                },
-                "WriteCapacityUnits": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ReadCapacityUnits",
-                "WriteCapacityUnits"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ReplicaSpecification": {
+        "AWS::Bedrock::Prompt.PromptVariant": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInferenceConfiguration"
                 },
-                "ReadCapacityUnits": {
-                    "type": "number"
+                "ModelId": {
+                    "type": "string"
                 },
-                "Region": {
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Region"
+                "Name",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ScalingPolicy": {
+        "AWS::Bedrock::Prompt.TextPromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "TargetTrackingScalingPolicyConfiguration": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextS3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextS3Location"
                 }
             },
             "type": "object"
         },
-        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+        "AWS::Bedrock::Prompt.TextS3Location": {
             "additionalProperties": false,
             "properties": {
-                "DisableScaleIn": {
-                    "type": "boolean"
-                },
-                "ScaleInCooldown": {
-                    "type": "number"
+                "Bucket": {
+                    "type": "string"
                 },
-                "ScaleOutCooldown": {
-                    "type": "number"
+                "Key": {
+                    "type": "string"
                 },
-                "TargetValue": {
-                    "type": "number"
+                "Version": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TargetValue"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account": {
+        "AWS::Bedrock::PromptVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26026,18 +27658,30 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExpiryEventsConfiguration": {
-                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PromptArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "ExpiryEventsConfiguration"
+                        "PromptArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Account"
+                        "AWS::Bedrock::PromptVersion"
                     ],
                     "type": "string"
                 },
@@ -26056,16 +27700,107 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+        "AWS::Bedrock::PromptVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "DaysBeforeExpiry": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                },
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
                     "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate": {
+        "AWS::Bedrock::PromptVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInferenceConfiguration"
+                },
+                "ModelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "TemplateType"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26100,48 +27835,39 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CertificateAuthorityArn": {
-                            "type": "string"
+                        "AccountGrouping": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
                         },
-                        "CertificateTransparencyLoggingPreference": {
-                            "type": "string"
+                        "ComputationPreference": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
                         },
-                        "DomainName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "DomainValidationOptions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
-                            },
-                            "type": "array"
-                        },
-                        "KeyAlgorithm": {
+                        "Name": {
                             "type": "string"
                         },
-                        "SubjectAlternativeNames": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "PrimaryAccountId": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ValidationMethod": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "AccountGrouping",
+                        "ComputationPreference",
+                        "Name",
+                        "PrimaryAccountId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Certificate"
+                        "AWS::BillingConductor::BillingGroup"
                     ],
                     "type": "string"
                 },
@@ -26160,25 +27886,37 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "HostedZoneId": {
-                    "type": "string"
+                "AutoAssociate": {
+                    "type": "boolean"
                 },
-                "ValidationDomain": {
+                "LinkedAccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LinkedAccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "PricingPlanArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "DomainName"
+                "PricingPlanArn"
             ],
             "type": "object"
         },
-        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26213,52 +27951,40 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
-                            "type": "string"
-                        },
-                        "GuardrailPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "IamRoleArn": {
+                        "AccountId": {
                             "type": "string"
                         },
-                        "LoggingLevel": {
+                        "BillingGroupArn": {
                             "type": "string"
                         },
-                        "SnsTopicArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "BillingPeriodRange": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
                         },
-                        "TeamId": {
-                            "type": "string"
+                        "CustomLineItemChargeDetails": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
                         },
-                        "TeamsChannelId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TeamsTenantId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "UserRoleRequired": {
-                            "type": "boolean"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "TeamId",
-                        "TeamsChannelId",
-                        "TeamsTenantId"
+                        "BillingGroupArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
+                        "AWS::BillingConductor::CustomLineItem"
                     ],
                     "type": "string"
                 },
@@ -26277,7 +28003,96 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Chatbot::SlackChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+            "additionalProperties": false,
+            "properties": {
+                "ExclusiveEndBillingPeriod": {
+                    "type": "string"
+                },
+                "InclusiveStartBillingPeriod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Flat": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
+                },
+                "LineItemFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                    },
+                    "type": "array"
+                },
+                "Percentage": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChargeValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChargeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssociatedResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PercentageValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "PercentageValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MatchOption": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attribute",
+                "MatchOption",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::PricingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26312,48 +28127,33 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "GuardrailPolicies": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PricingRuleArns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "IamRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingLevel": {
-                            "type": "string"
-                        },
-                        "SlackChannelId": {
-                            "type": "string"
-                        },
-                        "SlackWorkspaceId": {
-                            "type": "string"
-                        },
-                        "SnsTopicArns": {
+                        "Tags": {
                             "items": {
-                                "type": "string"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserRoleRequired": {
-                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "SlackChannelId",
-                        "SlackWorkspaceId"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::SlackChannelConfiguration"
+                        "AWS::BillingConductor::PricingPlan"
                     ],
                     "type": "string"
                 },
@@ -26372,7 +28172,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate": {
+        "AWS::BillingConductor::PricingRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26407,45 +28207,53 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AnalysisParameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
-                            },
-                            "type": "array"
+                        "BillingEntity": {
+                            "type": "string"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "Format": {
+                        "ModifierPercentage": {
+                            "type": "number"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Operation": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Scope": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        "Service": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Tiering": {
+                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UsageType": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "MembershipIdentifier",
                         "Name",
-                        "Source"
+                        "Scope",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::AnalysisTemplate"
+                        "AWS::BillingConductor::PricingRule"
                     ],
                     "type": "string"
                 },
@@ -26464,53 +28272,28 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
-            "additionalProperties": false,
-            "properties": {
-                "DefaultValue": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+        "AWS::BillingConductor::PricingRule.FreeTier": {
             "additionalProperties": false,
             "properties": {
-                "ReferencedTables": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Activated": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "ReferencedTables"
+                "Activated"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+        "AWS::BillingConductor::PricingRule.Tiering": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
-                    "type": "string"
+                "FreeTier": {
+                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
                 }
             },
-            "required": [
-                "Text"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration": {
+        "AWS::Budgets::Budget": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26545,56 +28328,30 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CreatorDisplayName": {
-                            "type": "string"
-                        },
-                        "CreatorMemberAbilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "CreatorPaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
-                        },
-                        "DataEncryptionMetadata": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
-                        },
-                        "Description": {
-                            "type": "string"
+                        "Budget": {
+                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
                         },
-                        "Members": {
+                        "NotificationsWithSubscribers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
                             },
                             "type": "array"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "CreatorDisplayName",
-                        "CreatorMemberAbilities",
-                        "Description",
-                        "Members",
-                        "Name",
-                        "QueryLogStatus"
+                        "Budget"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Collaboration"
+                        "AWS::Budgets::Budget"
                     ],
                     "type": "string"
                 },
@@ -26613,89 +28370,219 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+        "AWS::Budgets::Budget.AutoAdjustData": {
             "additionalProperties": false,
             "properties": {
-                "AllowCleartext": {
-                    "type": "boolean"
-                },
-                "AllowDuplicates": {
-                    "type": "boolean"
-                },
-                "AllowJoinsOnColumnsWithDifferentNames": {
-                    "type": "boolean"
+                "AutoAdjustType": {
+                    "type": "string"
                 },
-                "PreserveNulls": {
-                    "type": "boolean"
+                "HistoricalOptions": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
                 }
             },
             "required": [
-                "AllowCleartext",
-                "AllowDuplicates",
-                "AllowJoinsOnColumnsWithDifferentNames",
-                "PreserveNulls"
+                "AutoAdjustType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+        "AWS::Budgets::Budget.BudgetData": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "AutoAdjustData": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
+                },
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
                     "type": "string"
                 },
-                "DisplayName": {
+                "BudgetType": {
                     "type": "string"
                 },
-                "MemberAbilities": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "CostFilters": {
+                    "type": "object"
                 },
-                "PaymentConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AccountId",
-                "DisplayName",
-                "MemberAbilities"
+                "BudgetType",
+                "TimeUnit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+        "AWS::Budgets::Budget.CostTypes": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                "IncludeCredit": {
+                    "type": "boolean"
+                },
+                "IncludeDiscount": {
+                    "type": "boolean"
+                },
+                "IncludeOtherSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeRecurring": {
+                    "type": "boolean"
+                },
+                "IncludeRefund": {
+                    "type": "boolean"
+                },
+                "IncludeSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeSupport": {
+                    "type": "boolean"
+                },
+                "IncludeTax": {
+                    "type": "boolean"
+                },
+                "IncludeUpfront": {
+                    "type": "boolean"
+                },
+                "UseAmortized": {
+                    "type": "boolean"
+                },
+                "UseBlended": {
+                    "type": "boolean"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+        "AWS::Budgets::Budget.HistoricalOptions": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "BudgetAdjustmentPeriod": {
+                    "type": "number"
                 }
             },
             "required": [
-                "IsResponsible"
+                "BudgetAdjustmentPeriod"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable": {
+        "AWS::Budgets::Budget.Notification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ComparisonOperator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
+                "NotificationType": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "ThresholdType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "NotificationType",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+            "additionalProperties": false,
+            "properties": {
+                "Notification": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
+                },
+                "Subscribers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Notification",
+                "Subscribers"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Spend": {
+            "additionalProperties": false,
+            "properties": {
+                "Amount": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Amount",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "SubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "SubscriptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.TimePeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
                         "Retain",
                         "Snapshot"
                     ],
@@ -26722,48 +28609,54 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowedColumns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
                         },
-                        "AnalysisMethod": {
+                        "ActionType": {
                             "type": "string"
                         },
-                        "AnalysisRules": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
-                            },
-                            "type": "array"
+                        "ApprovalModel": {
+                            "type": "string"
                         },
-                        "Description": {
+                        "BudgetName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "TableReference": {
-                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        "NotificationType": {
+                            "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "AllowedColumns",
-                        "AnalysisMethod",
-                        "Name",
-                        "TableReference"
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTable"
+                        "AWS::Budgets::BudgetsAction"
                     ],
                     "type": "string"
                 },
@@ -26782,98 +28675,56 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "ColumnNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Function": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnNames",
-                "Function"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Type": {
                     "type": "string"
                 },
-                "Minimum": {
+                "Value": {
                     "type": "number"
-                },
-                "Type": {
-                    "type": "string"
                 }
             },
             "required": [
-                "ColumnName",
-                "Minimum",
-                "Type"
+                "Type",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+        "AWS::Budgets::BudgetsAction.Definition": {
             "additionalProperties": false,
             "properties": {
-                "Policy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
                 },
-                "Type": {
-                    "type": "string"
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
                 }
             },
-            "required": [
-                "Policy",
-                "Type"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AggregateColumns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
-                    },
-                    "type": "array"
-                },
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DimensionColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
+                "Groups": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "JoinRequired": {
+                "PolicyArn": {
                     "type": "string"
                 },
-                "OutputConstraints": {
+                "Roles": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "ScalarFunctions": {
+                "Users": {
                     "items": {
                         "type": "string"
                     },
@@ -26881,54 +28732,33 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "AggregateColumns",
-                "DimensionColumns",
-                "JoinColumns",
-                "OutputConstraints",
-                "ScalarFunctions"
+                "PolicyArn"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+        "AWS::Budgets::BudgetsAction.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "AllowedAnalyses": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AllowedAnalysisProviders": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
                 },
-                "DifferentialPrivacy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AllowedAnalyses"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "PolicyId": {
+                    "type": "string"
                 },
-                "ListColumns": {
+                "TargetIds": {
                     "items": {
                         "type": "string"
                     },
@@ -26936,94 +28766,51 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "JoinColumns",
-                "ListColumns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "V1": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
-                }
-            },
-            "required": [
-                "V1"
+                "PolicyId",
+                "TargetIds"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
-            "additionalProperties": false,
-            "properties": {
-                "Aggregation": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
-                },
-                "Custom": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
-                },
-                "List": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Columns": {
+                "InstanceIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "Columns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "Name": {
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name"
+                "InstanceIds",
+                "Region",
+                "Subtype"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+        "AWS::Budgets::BudgetsAction.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "DatabaseName": {
+                "Address": {
                     "type": "string"
                 },
-                "TableName": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "DatabaseName",
-                "TableName"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.TableReference": {
-            "additionalProperties": false,
-            "properties": {
-                "Glue": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
-                }
-            },
-            "required": [
-                "Glue"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTableAssociation": {
+        "AWS::CE::AnomalyMonitor": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27058,39 +28845,34 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfiguredTableIdentifier": {
-                            "type": "string"
-                        },
-                        "Description": {
+                        "MonitorDimension": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "MonitorName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "MonitorSpecification": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "MonitorType": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "ConfiguredTableIdentifier",
-                        "MembershipIdentifier",
-                        "Name",
-                        "RoleArn"
+                        "MonitorName",
+                        "MonitorType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTableAssociation"
+                        "AWS::CE::AnomalyMonitor"
                     ],
                     "type": "string"
                 },
@@ -27109,7 +28891,23 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership": {
+        "AWS::CE::AnomalyMonitor.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27144,34 +28942,48 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CollaborationIdentifier": {
+                        "Frequency": {
                             "type": "string"
                         },
-                        "DefaultResultConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
-                        },
-                        "PaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
+                        "MonitorArnList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "QueryLogStatus": {
-                            "type": "string"
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
+                            },
+                            "type": "array"
                         },
-                        "Tags": {
+                        "Subscribers": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
                             },
                             "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdExpression": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CollaborationIdentifier",
-                        "QueryLogStatus"
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Membership"
+                        "AWS::CE::AnomalySubscription"
                     ],
                     "type": "string"
                 },
@@ -27190,77 +29002,42 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
-                }
-            },
-            "required": [
-                "QueryCompute"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
-                }
-            },
-            "required": [
-                "S3"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+        "AWS::CE::AnomalySubscription.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "OutputConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "RoleArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "OutputConfiguration"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "IsResponsible"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+        "AWS::CE::AnomalySubscription.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "Address": {
                     "type": "string"
                 },
-                "KeyPrefix": {
+                "Status": {
                     "type": "string"
                 },
-                "ResultFormat": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "ResultFormat"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate": {
+        "AWS::CE::CostCategory": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27295,36 +29072,32 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoRefresh": {
+                        "DefaultValue": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Parameters": {
-                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        "RuleVersion": {
+                            "type": "string"
                         },
-                        "PrivacyBudgetType": {
+                        "Rules": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "SplitChargeRules": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AutoRefresh",
-                        "MembershipIdentifier",
-                        "Parameters",
-                        "PrivacyBudgetType"
+                        "Name",
+                        "RuleVersion",
+                        "Rules"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::PrivacyBudgetTemplate"
+                        "AWS::CE::CostCategory"
                     ],
                     "type": "string"
                 },
@@ -27343,23 +29116,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
-            "additionalProperties": false,
-            "properties": {
-                "Epsilon": {
-                    "type": "number"
-                },
-                "UsersNoisePerQuery": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Epsilon",
-                "UsersNoisePerQuery"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset": {
+        "AWS::CUR::ReportDefinition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27394,38 +29151,65 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "AdditionalArtifacts": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "TrainingData": {
+                        "AdditionalSchemaElements": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "BillingViewArn": {
+                            "type": "string"
+                        },
+                        "Compression": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "RefreshClosedReports": {
+                            "type": "boolean"
+                        },
+                        "ReportName": {
+                            "type": "string"
+                        },
+                        "ReportVersioning": {
+                            "type": "string"
+                        },
+                        "S3Bucket": {
+                            "type": "string"
+                        },
+                        "S3Prefix": {
+                            "type": "string"
+                        },
+                        "S3Region": {
+                            "type": "string"
+                        },
+                        "TimeUnit": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RoleArn",
-                        "TrainingData"
+                        "Compression",
+                        "Format",
+                        "RefreshClosedReports",
+                        "ReportName",
+                        "ReportVersioning",
+                        "S3Bucket",
+                        "S3Prefix",
+                        "S3Region",
+                        "TimeUnit"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRoomsML::TrainingDataset"
+                        "AWS::CUR::ReportDefinition"
                     ],
                     "type": "string"
                 },
@@ -27444,92 +29228,92 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
+        "AWS::Cassandra::Keyspace": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Condition": {
                     "type": "string"
                 },
-                "ColumnTypes": {
-                    "items": {
-                        "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": {
+                        "KeyspaceName": {
+                            "type": "string"
+                        },
+                        "ReplicationSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
                     },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnTypes"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "GlueDataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
-                }
-            },
-            "required": [
-                "GlueDataSource"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
-            "additionalProperties": false,
-            "properties": {
-                "InputConfig": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "InputConfig",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
+        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
             "additionalProperties": false,
             "properties": {
-                "DataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
-                },
-                "Schema": {
+                "RegionList": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "DataSource",
-                "Schema"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "CatalogId": {
-                    "type": "string"
-                },
-                "DatabaseName": {
-                    "type": "string"
                 },
-                "TableName": {
+                "ReplicationStrategy": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DatabaseName",
-                "TableName"
-            ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2": {
+        "AWS::Cassandra::Table": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27564,34 +29348,52 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutomaticStopTimeMinutes": {
-                            "type": "number"
+                        "AutoScalingSpecifications": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
                         },
-                        "ConnectionType": {
-                            "type": "string"
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
                         },
-                        "Description": {
-                            "type": "string"
+                        "ClientSideTimestampsEnabled": {
+                            "type": "boolean"
                         },
-                        "ImageId": {
-                            "type": "string"
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
                         },
-                        "InstanceType": {
-                            "type": "string"
+                        "DefaultTimeToLive": {
+                            "type": "number"
                         },
-                        "Name": {
-                            "type": "string"
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
                         },
-                        "OwnerArn": {
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "Repositories": {
+                        "PartitionKeyColumns": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
                             },
                             "type": "array"
                         },
-                        "SubnetId": {
+                        "PointInTimeRecoveryEnabled": {
+                            "type": "boolean"
+                        },
+                        "RegularColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "ReplicaSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TableName": {
                             "type": "string"
                         },
                         "Tags": {
@@ -27602,14 +29404,14 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "ImageId",
-                        "InstanceType"
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cloud9::EnvironmentEC2"
+                        "AWS::Cassandra::Table"
                     ],
                     "type": "string"
                 },
@@ -27628,23 +29430,162 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2.Repository": {
+        "AWS::Cassandra::Table.AutoScalingSetting": {
             "additionalProperties": false,
             "properties": {
-                "PathComponent": {
+                "AutoScalingDisabled": {
+                    "type": "boolean"
+                },
+                "MaximumUnits": {
+                    "type": "number"
+                },
+                "MinimumUnits": {
+                    "type": "number"
+                },
+                "ScalingPolicy": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.AutoScalingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "WriteCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.BillingMode": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
                     "type": "string"
                 },
-                "RepositoryUrl": {
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                },
+                "OrderBy": {
                     "type": "string"
                 }
             },
             "required": [
-                "PathComponent",
-                "RepositoryUrl"
+                "Column"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::CustomResource": {
+        "AWS::Cassandra::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "ColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "ColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.EncryptionSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKeyIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27679,18 +29620,18 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ServiceToken": {
-                            "type": "string"
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
                         }
                     },
                     "required": [
-                        "ServiceToken"
+                        "ExpiryEventsConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::CustomResource"
+                        "AWS::CertificateManager::Account"
                     ],
                     "type": "string"
                 },
@@ -27709,7 +29650,16 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookDefaultVersion": {
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27744,21 +29694,48 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "CertificateAuthorityArn": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "CertificateTransparencyLoggingPreference": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DomainName"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookDefaultVersion"
+                        "AWS::CertificateManager::Certificate"
                     ],
                     "type": "string"
                 },
@@ -27772,11 +29749,30 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookTypeConfig": {
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27811,27 +29807,58 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "ConfigurationAlias": {
-                            "type": "string"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "TypeArn": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
                             "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Configuration"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TeamsChannelId": {
+                            "type": "string"
+                        },
+                        "TeamsTenantId": {
+                            "type": "string"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "TeamId",
+                        "TeamsChannelId",
+                        "TeamsTenantId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookTypeConfig"
+                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27850,7 +29877,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion": {
+        "AWS::Chatbot::SlackChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27885,28 +29912,54 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "SchemaHandlerPackage": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
                             "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookVersion"
+                        "AWS::Chatbot::SlackChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27925,19 +29978,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion.LoggingConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "LogGroupName": {
-                    "type": "string"
-                },
-                "LogRoleArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFormation::Macro": {
+        "AWS::CleanRooms::AnalysisTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27972,31 +30013,45 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "AnalysisParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
+                            },
+                            "type": "array"
                         },
-                        "FunctionName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "LogGroupName": {
+                        "Format": {
                             "type": "string"
                         },
-                        "LogRoleARN": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "FunctionName",
-                        "Name"
+                        "Format",
+                        "MembershipIdentifier",
+                        "Name",
+                        "Source"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Macro"
+                        "AWS::CleanRooms::AnalysisTemplate"
                     ],
                     "type": "string"
                 },
@@ -28015,7 +30070,53 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleDefaultVersion": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferencedTables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ReferencedTables"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28050,21 +30151,56 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "CreatorDisplayName": {
                             "type": "string"
                         },
-                        "ModuleName": {
+                        "CreatorMemberAbilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CreatorPaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                        },
+                        "DataEncryptionMetadata": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "CreatorDisplayName",
+                        "CreatorMemberAbilities",
+                        "Description",
+                        "Members",
+                        "Name",
+                        "QueryLogStatus"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleDefaultVersion"
+                        "AWS::CleanRooms::Collaboration"
                     ],
                     "type": "string"
                 },
@@ -28078,11 +30214,86 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleVersion": {
+        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCleartext": {
+                    "type": "boolean"
+                },
+                "AllowDuplicates": {
+                    "type": "boolean"
+                },
+                "AllowJoinsOnColumnsWithDifferentNames": {
+                    "type": "boolean"
+                },
+                "PreserveNulls": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowCleartext",
+                "AllowDuplicates",
+                "AllowJoinsOnColumnsWithDifferentNames",
+                "PreserveNulls"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "MemberAbilities": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PaymentConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                }
+            },
+            "required": [
+                "AccountId",
+                "DisplayName",
+                "MemberAbilities"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28117,22 +30328,48 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ModuleName": {
+                        "AllowedColumns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalysisMethod": {
                             "type": "string"
                         },
-                        "ModulePackage": {
+                        "AnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "TableReference": {
+                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ModuleName",
-                        "ModulePackage"
+                        "AllowedColumns",
+                        "AnalysisMethod",
+                        "Name",
+                        "TableReference"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleVersion"
+                        "AWS::CleanRooms::ConfiguredTable"
                     ],
                     "type": "string"
                 },
@@ -28151,7 +30388,263 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::PublicTypeVersion": {
+        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnNames",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Minimum": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Minimum",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AggregateColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
+                    },
+                    "type": "array"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DimensionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinRequired": {
+                    "type": "string"
+                },
+                "OutputConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                    },
+                    "type": "array"
+                },
+                "ScalarFunctions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AggregateColumns",
+                "DimensionColumns",
+                "JoinColumns",
+                "OutputConstraints",
+                "ScalarFunctions"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedAnalysisProviders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DifferentialPrivacy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                },
+                "DisallowedOutputColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AllowedAnalyses"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ListColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "JoinColumns",
+                "ListColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.TableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Glue": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
+                }
+            },
+            "required": [
+                "Glue"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28186,27 +30679,45 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "ConfiguredTableAssociationAnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "ConfiguredTableIdentifier": {
                             "type": "string"
                         },
-                        "LogDeliveryBucket": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicVersionNumber": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ConfiguredTableIdentifier",
+                        "MembershipIdentifier",
+                        "Name",
+                        "RoleArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::PublicTypeVersion"
+                        "AWS::CleanRooms::ConfiguredTableAssociation"
                     ],
                     "type": "string"
                 },
@@ -28220,11 +30731,109 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::Publisher": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28259,21 +30868,38 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AcceptTermsAndConditions": {
-                            "type": "boolean"
+                        "Description": {
+                            "type": "string"
                         },
-                        "ConnectionArn": {
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "AcceptTermsAndConditions"
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Publisher"
+                        "AWS::CleanRooms::IdMappingTable"
                     ],
                     "type": "string"
                 },
@@ -28292,7 +30918,54 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceDefaultVersion": {
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingTableInputSource": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "IdMappingTableInputSource"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "IdNamespaceAssociationId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdNamespaceAssociationId",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28327,21 +31000,38 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "IdMappingConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig"
+                        },
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig"
+                        },
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceDefaultVersion"
+                        "AWS::CleanRooms::IdNamespaceAssociation"
                     ],
                     "type": "string"
                 },
@@ -28355,11 +31045,55 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion": {
+        "AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowUseAsDimensionColumn": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowUseAsDimensionColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingWorkflowsSupported": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "IdNamespaceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28394,28 +31128,34 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "CollaborationIdentifier": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        "DefaultResultConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
                         },
-                        "SchemaHandlerPackage": {
-                            "type": "string"
+                        "PaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
                         },
-                        "TypeName": {
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "CollaborationIdentifier",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceVersion"
+                        "AWS::CleanRooms::Membership"
                     ],
                     "type": "string"
                 },
@@ -28434,19 +31174,77 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OutputConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "ResultFormat": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Bucket",
+                "ResultFormat"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::Stack": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28481,42 +31279,36 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "NotificationARNs": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "AutoRefresh": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
                         },
                         "Parameters": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
+                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        },
+                        "PrivacyBudgetType": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
-                        },
-                        "TimeoutInMinutes": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "TemplateURL"
+                        "AutoRefresh",
+                        "MembershipIdentifier",
+                        "Parameters",
+                        "PrivacyBudgetType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Stack"
+                        "AWS::CleanRooms::PrivacyBudgetTemplate"
                     ],
                     "type": "string"
                 },
@@ -28535,7 +31327,23 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Epsilon": {
+                    "type": "number"
+                },
+                "UsersNoisePerQuery": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Epsilon",
+                "UsersNoisePerQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRoomsML::TrainingDataset": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28570,73 +31378,38 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdministrationRoleARN": {
-                            "type": "string"
-                        },
-                        "AutoDeployment": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
-                        },
-                        "CallAs": {
-                            "type": "string"
-                        },
-                        "Capabilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "ExecutionRoleName": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ManagedExecution": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
-                        },
-                        "OperationPreferences": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
-                        },
-                        "Parameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                            },
-                            "type": "array"
-                        },
-                        "PermissionModel": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "StackInstancesGroup": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
                         },
-                        "StackSetName": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "TrainingData": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
                             },
                             "type": "array"
-                        },
-                        "TemplateBody": {
-                            "type": "string"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "PermissionModel",
-                        "StackSetName"
+                        "Name",
+                        "RoleArn",
+                        "TrainingData"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::StackSet"
+                        "AWS::CleanRoomsML::TrainingDataset"
                     ],
                     "type": "string"
                 },
@@ -28655,120 +31428,92 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.AutoDeployment": {
+        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "ColumnName": {
+                    "type": "string"
                 },
-                "RetainStacksOnAccountRemoval": {
-                    "type": "boolean"
+                "ColumnTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "ColumnTypes"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
             "additionalProperties": false,
             "properties": {
-                "AccountFilterType": {
-                    "type": "string"
-                },
-                "Accounts": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AccountsUrl": {
-                    "type": "string"
-                },
-                "OrganizationalUnitIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "GlueDataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
                 }
             },
+            "required": [
+                "GlueDataSource"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.ManagedExecution": {
+        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
             "additionalProperties": false,
             "properties": {
-                "Active": {
-                    "type": "boolean"
+                "InputConfig": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "InputConfig",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.OperationPreferences": {
+        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
             "additionalProperties": false,
             "properties": {
-                "FailureToleranceCount": {
-                    "type": "number"
-                },
-                "FailureTolerancePercentage": {
-                    "type": "number"
-                },
-                "MaxConcurrentCount": {
-                    "type": "number"
-                },
-                "MaxConcurrentPercentage": {
-                    "type": "number"
-                },
-                "RegionConcurrencyType": {
-                    "type": "string"
+                "DataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
                 },
-                "RegionOrder": {
+                "Schema": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
                     },
                     "type": "array"
                 }
             },
-            "type": "object"
-        },
-        "AWS::CloudFormation::StackSet.Parameter": {
-            "additionalProperties": false,
-            "properties": {
-                "ParameterKey": {
-                    "type": "string"
-                },
-                "ParameterValue": {
-                    "type": "string"
-                }
-            },
             "required": [
-                "ParameterKey",
-                "ParameterValue"
+                "DataSource",
+                "Schema"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.StackInstances": {
+        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
             "additionalProperties": false,
             "properties": {
-                "DeploymentTargets": {
-                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                "CatalogId": {
+                    "type": "string"
                 },
-                "ParameterOverrides": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                    },
-                    "type": "array"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Regions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "TableName": {
+                    "type": "string"
                 }
             },
             "required": [
-                "DeploymentTargets",
-                "Regions"
+                "DatabaseName",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation": {
+        "AWS::Cloud9::EnvironmentEC2": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28803,42 +31548,52 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoUpdate": {
-                            "type": "boolean"
+                        "AutomaticStopTimeMinutes": {
+                            "type": "number"
                         },
-                        "ExecutionRoleArn": {
+                        "ConnectionType": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
-                        },
-                        "MajorVersion": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicTypeArn": {
+                        "ImageId": {
                             "type": "string"
                         },
-                        "PublisherId": {
+                        "InstanceType": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "OwnerArn": {
                             "type": "string"
                         },
-                        "TypeNameAlias": {
-                            "type": "string"
+                        "Repositories": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                            },
+                            "type": "array"
                         },
-                        "VersionBump": {
+                        "SubnetId": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::TypeActivation"
+                        "AWS::Cloud9::EnvironmentEC2"
                     ],
                     "type": "string"
                 },
@@ -28852,31 +31607,33 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "PathComponent": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "RepositoryUrl": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitCondition": {
+        "AWS::CloudFormation::CustomResource": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
-                "CreationPolicy": {
-                    "type": "object"
-                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -28906,21 +31663,21 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Count": {
+                        "ServiceTimeout": {
                             "type": "number"
                         },
-                        "Handle": {
-                            "type": "string"
-                        },
-                        "Timeout": {
+                        "ServiceToken": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ServiceToken"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitCondition"
+                        "AWS::CloudFormation::CustomResource"
                     ],
                     "type": "string"
                 },
@@ -28934,11 +31691,12 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitConditionHandle": {
+        "AWS::CloudFormation::HookDefaultVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28972,12 +31730,22 @@ var CloudformationSchema = `{
                 },
                 "Properties": {
                     "additionalProperties": false,
-                    "properties": {},
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitConditionHandle"
+                        "AWS::CloudFormation::HookDefaultVersion"
                     ],
                     "type": "string"
                 },
@@ -28995,7 +31763,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy": {
+        "AWS::CloudFormation::HookTypeConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29030,18 +31798,27 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CachePolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "ConfigurationAlias": {
+                            "type": "string"
+                        },
+                        "TypeArn": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CachePolicyConfig"
+                        "Configuration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CachePolicy"
+                        "AWS::CloudFormation::HookTypeConfig"
                     ],
                     "type": "string"
                 },
@@ -29060,119 +31837,239 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+        "AWS::CloudFormation::HookVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "Condition": {
                     "type": "string"
                 },
-                "DefaultTTL": {
-                    "type": "number"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "MaxTTL": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "MinTTL": {
-                    "type": "number"
+                "Metadata": {
+                    "type": "object"
                 },
-                "Name": {
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookVersion"
+                    ],
                     "type": "string"
                 },
-                "ParametersInCacheKeyAndForwardedToOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "DefaultTTL",
-                "MaxTTL",
-                "MinTTL",
-                "Name",
-                "ParametersInCacheKeyAndForwardedToOrigin"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+        "AWS::CloudFormation::HookVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "CookieBehavior": {
+                "LogGroupName": {
                     "type": "string"
                 },
-                "Cookies": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "CookieBehavior"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+        "AWS::CloudFormation::Macro": {
             "additionalProperties": false,
             "properties": {
-                "HeaderBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "HeaderBehavior"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
-            "additionalProperties": false,
-            "properties": {
-                "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "EnableAcceptEncodingBrotli": {
-                    "type": "boolean"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "EnableAcceptEncodingGzip": {
-                    "type": "boolean"
+                "Metadata": {
+                    "type": "object"
                 },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
                 },
-                "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "CookiesConfig",
-                "EnableAcceptEncodingGzip",
-                "HeadersConfig",
-                "QueryStringsConfig"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+        "AWS::CloudFormation::ModuleDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "QueryStringBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "QueryStrings": {
-                    "items": {
-                        "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "QueryStringBehavior"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+        "AWS::CloudFormation::ModuleVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29207,18 +32104,22 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CloudFrontOriginAccessIdentityConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName",
+                        "ModulePackage"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        "AWS::CloudFormation::ModuleVersion"
                     ],
                     "type": "string"
                 },
@@ -29237,19 +32138,80 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+        "AWS::CloudFormation::PublicTypeVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "LogDeliveryBucket": {
+                            "type": "string"
+                        },
+                        "PublicVersionNumber": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::PublicTypeVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Comment"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+        "AWS::CloudFormation::Publisher": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29284,18 +32246,21 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContinuousDeploymentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                        "AWS::CloudFormation::Publisher"
                     ],
                     "type": "string"
                 },
@@ -29314,134 +32279,250 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+        "AWS::CloudFormation::ResourceDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "Condition": {
+                    "type": "string"
                 },
-                "SingleHeaderPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "StagingDistributionDnsNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TrafficConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Enabled",
-                "StagingDistributionDnsNames"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IdleTTL": {
-                    "type": "number"
                 },
-                "MaximumTTL": {
-                    "type": "number"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "IdleTTL",
-                "MaximumTTL"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+        "AWS::CloudFormation::ResourceVersion": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "Condition": {
                     "type": "string"
                 },
-                "Value": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Header",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Header": {
+                },
+                "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": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceVersion"
+                    ],
                     "type": "string"
                 },
-                "Value": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "LogGroupName": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "Weight"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+        "AWS::CloudFormation::Stack": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "Condition": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Weight"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "SingleHeaderConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                "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": {
+                        "NotificationARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "TemplateURL"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution": {
+        "AWS::CloudFormation::StackSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29476,24 +32557,73 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        "AdministrationRoleARN": {
+                            "type": "string"
+                        },
+                        "AutoDeployment": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
+                        },
+                        "CallAs": {
+                            "type": "string"
+                        },
+                        "Capabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleName": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
+                        },
+                        "OperationPreferences": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionModel": {
+                            "type": "string"
+                        },
+                        "StackInstancesGroup": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                            },
+                            "type": "array"
+                        },
+                        "StackSetName": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DistributionConfig"
+                        "PermissionModel",
+                        "StackSetName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Distribution"
+                        "AWS::CloudFormation::StackSet"
                     ],
                     "type": "string"
                 },
@@ -29512,142 +32642,1002 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CacheBehavior": {
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "CachePolicyId": {
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountFilterType": {
                     "type": "string"
                 },
-                "CachedMethods": {
+                "Accounts": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "AccountsUrl": {
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
-                },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
-                },
-                "LambdaFunctionAssociations": {
+                "OrganizationalUnitIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                        "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.ManagedExecution": {
+            "additionalProperties": false,
+            "properties": {
+                "Active": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrencyMode": {
+                    "type": "string"
                 },
-                "MaxTTL": {
+                "FailureToleranceCount": {
                     "type": "number"
                 },
-                "MinTTL": {
+                "FailureTolerancePercentage": {
                     "type": "number"
                 },
-                "OriginRequestPolicyId": {
-                    "type": "string"
-                },
-                "PathPattern": {
-                    "type": "string"
-                },
-                "RealtimeLogConfigArn": {
-                    "type": "string"
-                },
-                "ResponseHeadersPolicyId": {
-                    "type": "string"
+                "MaxConcurrentCount": {
+                    "type": "number"
                 },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                "MaxConcurrentPercentage": {
+                    "type": "number"
                 },
-                "TargetOriginId": {
+                "RegionConcurrencyType": {
                     "type": "string"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TrustedSigners": {
+                "RegionOrder": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
-                },
-                "ViewerProtocolPolicy": {
-                    "type": "string"
                 }
             },
-            "required": [
-                "PathPattern",
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Cookies": {
+        "AWS::CloudFormation::StackSet.Parameter": {
             "additionalProperties": false,
             "properties": {
-                "Forward": {
+                "ParameterKey": {
                     "type": "string"
                 },
-                "WhitelistedNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ParameterValue": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Forward"
+                "ParameterKey",
+                "ParameterValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+        "AWS::CloudFormation::StackSet.StackInstances": {
             "additionalProperties": false,
             "properties": {
-                "ErrorCachingMinTTL": {
-                    "type": "number"
-                },
-                "ErrorCode": {
-                    "type": "number"
+                "DeploymentTargets": {
+                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
                 },
-                "ResponseCode": {
-                    "type": "number"
+                "ParameterOverrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                    },
+                    "type": "array"
                 },
-                "ResponsePagePath": {
-                    "type": "string"
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "ErrorCode"
+                "DeploymentTargets",
+                "Regions"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+        "AWS::CloudFormation::TypeActivation": {
             "additionalProperties": false,
             "properties": {
-                "HTTPPort": {
-                    "type": "number"
+                "Condition": {
+                    "type": "string"
                 },
-                "HTTPSPort": {
-                    "type": "number"
+                "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": {
+                        "AutoUpdate": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
+                        },
+                        "MajorVersion": {
+                            "type": "string"
+                        },
+                        "PublicTypeArn": {
+                            "type": "string"
+                        },
+                        "PublisherId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeNameAlias": {
+                            "type": "string"
+                        },
+                        "VersionBump": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::TypeActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "CreationPolicy": {
+                    "type": "object"
+                },
+                "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": {
+                        "Count": {
+                            "type": "number"
+                        },
+                        "Handle": {
+                            "type": "string"
+                        },
+                        "Timeout": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitCondition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitConditionHandle": {
+            "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": {},
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitConditionHandle"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy": {
+            "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": {
+                        "CachePolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "CachePolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CachePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ParametersInCacheKeyAndForwardedToOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                }
+            },
+            "required": [
+                "DefaultTTL",
+                "MaxTTL",
+                "MinTTL",
+                "Name",
+                "ParametersInCacheKeyAndForwardedToOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
+            "additionalProperties": false,
+            "properties": {
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                },
+                "EnableAcceptEncodingBrotli": {
+                    "type": "boolean"
+                },
+                "EnableAcceptEncodingGzip": {
+                    "type": "boolean"
+                },
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                },
+                "QueryStringsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                }
+            },
+            "required": [
+                "CookiesConfig",
+                "EnableAcceptEncodingGzip",
+                "HeadersConfig",
+                "QueryStringsConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+            "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": {
+                        "CloudFrontOriginAccessIdentityConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        }
+                    },
+                    "required": [
+                        "CloudFrontOriginAccessIdentityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+            "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": {
+                        "ContinuousDeploymentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ContinuousDeploymentPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SingleHeaderPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                },
+                "SingleWeightPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                },
+                "StagingDistributionDnsNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrafficConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "StagingDistributionDnsNames"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTTL": {
+                    "type": "number"
+                },
+                "MaximumTTL": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTTL",
+                "MaximumTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SingleHeaderConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                },
+                "SingleWeightConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution": {
+            "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": {
+                        "DistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DistributionConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Distribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CacheBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "PathPattern": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathPattern",
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Cookies": {
+            "additionalProperties": false,
+            "properties": {
+                "Forward": {
+                    "type": "string"
+                },
+                "WhitelistedNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Forward"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorCachingMinTTL": {
+                    "type": "number"
+                },
+                "ErrorCode": {
+                    "type": "number"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponsePagePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ErrorCode"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HTTPPort": {
+                    "type": "number"
+                },
+                "HTTPSPort": {
+                    "type": "number"
                 },
                 "OriginKeepaliveTimeout": {
                     "type": "number"
@@ -33413,9 +37403,21 @@ var CloudformationSchema = `{
                         "EnvironmentType": {
                             "type": "string"
                         },
+                        "FleetServiceRole": {
+                            "type": "string"
+                        },
+                        "FleetVpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Fleet.VpcConfig"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "OverflowBehavior": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -33445,6 +37447,27 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodeBuild::Project": {
             "additionalProperties": false,
             "properties": {
@@ -33872,6 +37895,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "ScopeConfiguration": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.ScopeConfiguration"
+                },
                 "Webhook": {
                     "type": "boolean"
                 }
@@ -33912,6 +37938,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Project.ScopeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
         "AWS::CodeBuild::Project.Source": {
             "additionalProperties": false,
             "properties": {
@@ -35757,6 +39795,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.BeforeEntryConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35773,6 +39823,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Result": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleDeclaration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.EncryptionKey": {
             "additionalProperties": false,
             "properties": {
@@ -35789,6 +39854,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.FailureConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                },
+                "Result": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.GitBranchFilterCriteria": {
             "additionalProperties": false,
             "properties": {
@@ -35939,6 +40019,51 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.RuleDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RuleTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleTypeId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.RuleTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.StageDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35948,6 +40073,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "BeforeEntry": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BeforeEntryConditions"
+                },
                 "Blockers": {
                     "items": {
                         "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
@@ -35956,6 +40084,12 @@ var CloudformationSchema = `{
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.FailureConditions"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.SuccessConditions"
                 }
             },
             "required": [
@@ -35980,6 +40114,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.SuccessConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.VariableDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36670,6 +40816,12 @@ var CloudformationSchema = `{
                         "IdentityPoolName": {
                             "type": "string"
                         },
+                        "IdentityPoolTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "OpenIdConnectProviderARNs": {
                             "items": {
                                 "type": "string"
@@ -37062,6 +41214,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::LogDeliveryConfiguration.LogConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -37071,8 +41232,23 @@ var CloudformationSchema = `{
                 "EventSource": {
                     "type": "string"
                 },
+                "FirehoseConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration"
+                },
                 "LogLevel": {
                     "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.S3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::LogDeliveryConfiguration.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -37136,6 +41312,12 @@ var CloudformationSchema = `{
                         "DeviceConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
                         },
+                        "EmailAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "EmailAuthenticationSubject": {
+                            "type": "string"
+                        },
                         "EmailConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
                         },
@@ -37255,6 +41437,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomAuthMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::UserPool.CustomEmailSender": {
             "additionalProperties": false,
             "properties": {
@@ -37393,6 +41584,9 @@ var CloudformationSchema = `{
                 "MinimumLength": {
                     "type": "number"
                 },
+                "PasswordHistorySize": {
+                    "type": "number"
+                },
                 "RequireLowercase": {
                     "type": "boolean"
                 },
@@ -37516,6 +41710,9 @@ var CloudformationSchema = `{
         "AWS::Cognito::UserPool.UserPoolAddOns": {
             "additionalProperties": false,
             "properties": {
+                "AdvancedSecurityAdditionalFlows": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows"
+                },
                 "AdvancedSecurityMode": {
                     "type": "string"
                 }
@@ -40268,6 +44465,97 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::AgentStatus": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayOrder": {
+                            "type": "number"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResetOrderNumber": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "State"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::AgentStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::ApprovedOrigin": {
             "additionalProperties": false,
             "properties": {
@@ -42154,6 +46442,12 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "SubmitAutoEvaluationActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Connect::Rule.SubmitAutoEvaluationAction"
+                    },
+                    "type": "array"
+                },
                 "TaskActions": {
                     "items": {
                         "$ref": "#/definitions/AWS::Connect::Rule.TaskAction"
@@ -42313,6 +46607,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::Rule.SubmitAutoEvaluationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EvaluationFormArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EvaluationFormArn"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::Rule.TaskAction": {
             "additionalProperties": false,
             "properties": {
@@ -43095,6 +47401,185 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::UserHierarchyStructure": {
+            "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": {
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "UserHierarchyStructure": {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.UserHierarchyStructure"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyStructure"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFive": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFour": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelOne": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelThree": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelTwo": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.UserHierarchyStructure": {
+            "additionalProperties": false,
+            "properties": {
+                "LevelFive": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFive"
+                },
+                "LevelFour": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFour"
+                },
+                "LevelOne": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelOne"
+                },
+                "LevelThree": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelThree"
+                },
+                "LevelTwo": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelTwo"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Connect::View": {
             "additionalProperties": false,
             "properties": {
@@ -47270,9 +51755,6 @@ var CloudformationSchema = `{
                         "ComputeConfig": {
                             "$ref": "#/definitions/AWS::DMS::ReplicationConfig.ComputeConfig"
                         },
-                        "ReplicationConfigArn": {
-                            "type": "string"
-                        },
                         "ReplicationConfigIdentifier": {
                             "type": "string"
                         },
@@ -47304,6 +51786,14 @@ var CloudformationSchema = `{
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ComputeConfig",
+                        "ReplicationConfigIdentifier",
+                        "ReplicationType",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -47322,7 +51812,8 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -47421,6 +51912,9 @@ var CloudformationSchema = `{
                         "MultiAZ": {
                             "type": "boolean"
                         },
+                        "NetworkType": {
+                            "type": "string"
+                        },
                         "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
@@ -51688,9 +56182,18 @@ var CloudformationSchema = `{
                         "DomainIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentAccountIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentAccountRegion": {
+                            "type": "string"
+                        },
                         "EnvironmentProfileIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentRoleArn": {
+                            "type": "string"
+                        },
                         "GlossaryTerms": {
                             "items": {
                                 "type": "string"
@@ -51712,7 +56215,6 @@ var CloudformationSchema = `{
                     },
                     "required": [
                         "DomainIdentifier",
-                        "EnvironmentProfileIdentifier",
                         "Name",
                         "ProjectIdentifier"
                     ],
@@ -51751,6 +56253,95 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::DataZone::EnvironmentActions": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::EnvironmentActions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::EnvironmentBlueprintConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -51963,6 +56554,78 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::DataZone::GroupProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "GroupIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::GroupProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::DataZone::Project": {
             "additionalProperties": false,
             "properties": {
@@ -52041,6 +56704,95 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DataZone::ProjectMembership": {
+            "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": {
+                        "Designation": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Member": {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership.Member"
+                        },
+                        "ProjectIdentifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Designation",
+                        "DomainIdentifier",
+                        "Member",
+                        "ProjectIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::ProjectMembership"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::ProjectMembership.Member": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupIdentifier": {
+                    "type": "string"
+                },
+                "UserIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::SubscriptionTarget": {
             "additionalProperties": false,
             "properties": {
@@ -52162,6 +56914,117 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DataZone::UserProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserIdentifier": {
+                            "type": "string"
+                        },
+                        "UserType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "UserIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.IamUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.SsoUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.UserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.IamUserProfileDetails"
+                },
+                "Sso": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.SsoUserProfileDetails"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Deadline::Farm": {
             "additionalProperties": false,
             "properties": {
@@ -52205,6 +57068,12 @@ var CloudformationSchema = `{
                         },
                         "KmsKeyArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -52288,11 +57157,18 @@ var CloudformationSchema = `{
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
                         "Configuration",
                         "DisplayName",
+                        "FarmId",
                         "MaxWorkerCount",
                         "RoleArn"
                     ],
@@ -52655,6 +57531,12 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "VpcId": {
                             "type": "string"
                         }
@@ -52722,27 +57604,94 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Family": {
+                        "LicenseEndpointId": {
                             "type": "string"
                         },
-                        "LicenseEndpointId": {
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Deadline::MeteredProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Deadline::Monitor": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "Port": {
-                            "type": "number"
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
                         },
-                        "ProductId": {
+                        "IdentityCenterInstanceArn": {
                             "type": "string"
                         },
-                        "Vendor": {
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Subdomain": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DisplayName",
+                        "IdentityCenterInstanceArn",
+                        "RoleArn",
+                        "Subdomain"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Deadline::MeteredProduct"
+                        "AWS::Deadline::Monitor"
                     ],
                     "type": "string"
                 },
@@ -52756,7 +57705,8 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -52827,10 +57777,17 @@ var CloudformationSchema = `{
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DisplayName"
+                        "DisplayName",
+                        "FarmId"
                     ],
                     "type": "object"
                 },
@@ -53128,6 +58085,7 @@ var CloudformationSchema = `{
                     },
                     "required": [
                         "DisplayName",
+                        "FarmId",
                         "OsFamily"
                     ],
                     "type": "object"
@@ -54547,6 +59505,9 @@ var CloudformationSchema = `{
                         "TimeToLiveSpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
                         },
+                        "WriteOnDemandThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                        },
                         "WriteProvisionedThroughputSettings": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                         }
@@ -54645,6 +59606,9 @@ var CloudformationSchema = `{
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
                 },
+                "WriteOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                },
                 "WriteProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                 }
@@ -54734,6 +59698,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54755,6 +59728,9 @@ var CloudformationSchema = `{
                 "IndexName": {
                     "type": "string"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 }
@@ -54797,6 +59773,9 @@ var CloudformationSchema = `{
                 "PointInTimeRecoverySpecification": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 },
@@ -54914,6 +59893,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54997,6 +59985,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "OnDemandThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                        },
                         "PointInTimeRecoverySpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
                         },
@@ -55112,6 +60103,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "OnDemandThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                },
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
                 },
@@ -55211,6 +60205,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::Table.OnDemandThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                },
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
             "additionalProperties": false,
             "properties": {
@@ -56168,6 +61174,9 @@ var CloudformationSchema = `{
                         "BgpAsn": {
                             "type": "number"
                         },
+                        "BgpAsnExtended": {
+                            "type": "number"
+                        },
                         "CertificateArn": {
                             "type": "string"
                         },
@@ -57434,6 +62443,9 @@ var CloudformationSchema = `{
                         "Description": {
                             "type": "string"
                         },
+                        "EnablePrivateGua": {
+                            "type": "boolean"
+                        },
                         "OperatingRegions": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
@@ -58514,6 +63526,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EC2::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::Instance.Volume": {
             "additionalProperties": false,
             "properties": {
@@ -63190,12 +68214,6 @@ var CloudformationSchema = `{
                         "Ipv6CidrBlock": {
                             "type": "string"
                         },
-                        "Ipv6CidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Ipv6IpamPoolId": {
                             "type": "string"
                         },
@@ -63609,6 +68627,12 @@ var CloudformationSchema = `{
                         "SourcePortRange": {
                             "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "TrafficDirection": {
                             "type": "string"
                         },
@@ -63893,6 +68917,9 @@ var CloudformationSchema = `{
                         "PropagationDefaultRouteTableId": {
                             "type": "string"
                         },
+                        "SecurityGroupReferencingSupport": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -64570,6 +69597,7 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
+                        "DestinationCidrBlock",
                         "TransitGatewayRouteTableId"
                     ],
                     "type": "object"
@@ -64912,6 +69940,9 @@ var CloudformationSchema = `{
                 },
                 "Ipv6Support": {
                     "type": "string"
+                },
+                "SecurityGroupReferencingSupport": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -65673,6 +70704,24 @@ var CloudformationSchema = `{
                         "CustomerGatewayId": {
                             "type": "string"
                         },
+                        "EnableAcceleration": {
+                            "type": "boolean"
+                        },
+                        "LocalIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "LocalIpv6NetworkCidr": {
+                            "type": "string"
+                        },
+                        "OutsideIpAddressType": {
+                            "type": "string"
+                        },
+                        "RemoteIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "RemoteIpv6NetworkCidr": {
+                            "type": "string"
+                        },
                         "StaticRoutesOnly": {
                             "type": "boolean"
                         },
@@ -65685,6 +70734,12 @@ var CloudformationSchema = `{
                         "TransitGatewayId": {
                             "type": "string"
                         },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TunnelInsideIpVersion": {
+                            "type": "string"
+                        },
                         "Type": {
                             "type": "string"
                         },
@@ -67226,6 +72281,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "CustomRoleArn": {
+                            "type": "string"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -67520,6 +72578,9 @@ var CloudformationSchema = `{
             "properties": {
                 "ExecuteCommandConfiguration": {
                     "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                },
+                "ManagedStorageConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ManagedStorageConfiguration"
                 }
             },
             "type": "object"
@@ -67572,113 +72633,125 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::ECS::Cluster.ServiceConnectDefaults": {
+        "AWS::ECS::Cluster.ManagedStorageConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Namespace": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::ECS::ClusterCapacityProviderAssociations": {
-            "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": {
-                        "CapacityProviders": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Cluster": {
-                            "type": "string"
-                        },
-                        "DefaultCapacityProviderStrategy": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "CapacityProviders",
-                        "Cluster",
-                        "DefaultCapacityProviderStrategy"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::ECS::ClusterCapacityProviderAssociations"
-                    ],
+                "FargateEphemeralStorageKmsKeyId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "KmsKeyId": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+        "AWS::ECS::Cluster.ServiceConnectDefaults": {
             "additionalProperties": false,
             "properties": {
-                "Base": {
-                    "type": "number"
-                },
-                "CapacityProvider": {
+                "Namespace": {
                     "type": "string"
-                },
-                "Weight": {
-                    "type": "number"
                 }
             },
-            "required": [
-                "CapacityProvider"
-            ],
             "type": "object"
         },
-        "AWS::ECS::PrimaryTaskSet": {
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "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": {
+                        "CapacityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CapacityProviders",
+                        "Cluster",
+                        "DefaultCapacityProviderStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::ClusterCapacityProviderAssociations"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::PrimaryTaskSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -68588,6 +73661,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "RestartPolicy": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RestartPolicy"
+                },
                 "Secrets": {
                     "items": {
                         "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
@@ -69024,6 +74100,24 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::ECS::TaskDefinition.RestartPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnoredExitCodes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "RestartAttemptPeriod": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::TaskDefinition.RuntimePlatform": {
             "additionalProperties": false,
             "properties": {
@@ -69924,6 +75018,12 @@ var CloudformationSchema = `{
                         "ConfigurationValues": {
                             "type": "string"
                         },
+                        "PodIdentityAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Addon.PodIdentityAssociation"
+                            },
+                            "type": "array"
+                        },
                         "PreserveOnDelete": {
                             "type": "boolean"
                         },
@@ -69967,6 +75067,22 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EKS::Addon.PodIdentityAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceAccount"
+            ],
+            "type": "object"
+        },
         "AWS::EKS::Cluster": {
             "additionalProperties": false,
             "properties": {
@@ -70005,6 +75121,9 @@ var CloudformationSchema = `{
                         "AccessConfig": {
                             "$ref": "#/definitions/AWS::EKS::Cluster.AccessConfig"
                         },
+                        "BootstrapSelfManagedAddons": {
+                            "type": "boolean"
+                        },
                         "EncryptionConfig": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
@@ -70035,8 +75154,14 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "UpgradePolicy": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.UpgradePolicy"
+                        },
                         "Version": {
                             "type": "string"
+                        },
+                        "ZonalShiftConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ZonalShiftConfig"
                         }
                     },
                     "required": [
@@ -70211,6 +75336,24 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EKS::Cluster.UpgradePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "SupportType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ZonalShiftConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EKS::FargateProfile": {
             "additionalProperties": false,
             "properties": {
@@ -71163,6 +76306,9 @@ var CloudformationSchema = `{
                 "Name": {
                     "type": "string"
                 },
+                "ResizeSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetResizingSpecifications"
+                },
                 "TargetOnDemandCapacity": {
                     "type": "number"
                 },
@@ -71184,6 +76330,18 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::EMR::Cluster.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.InstanceGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71248,6 +76406,9 @@ var CloudformationSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71397,11 +76558,29 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71409,6 +76588,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.PlacementGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71560,6 +76754,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.StepConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71654,6 +76860,9 @@ var CloudformationSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "ResizeSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications"
+                        },
                         "TargetOnDemandCapacity": {
                             "type": "number"
                         },
@@ -71754,6 +76963,18 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71778,6 +76999,9 @@ var CloudformationSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71787,11 +77011,29 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71799,6 +77041,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -71821,6 +77078,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -72807,6 +78076,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "InteractiveConfiguration": {
+                            "$ref": "#/definitions/AWS::EMRServerless::Application.InteractiveConfiguration"
+                        },
                         "MaximumCapacity": {
                             "$ref": "#/definitions/AWS::EMRServerless::Application.MaximumAllowedResources"
                         },
@@ -72987,6 +78259,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMRServerless::Application.InteractiveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LivyEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "StudioEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMRServerless::Application.LogTypeMapKeyValuePair": {
             "additionalProperties": false,
             "properties": {
@@ -73091,6 +78375,9 @@ var CloudformationSchema = `{
                 "Disk": {
                     "type": "string"
                 },
+                "DiskType": {
+                    "type": "string"
+                },
                 "Memory": {
                     "type": "string"
                 }
@@ -75272,6 +80559,12 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "ListenerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute"
+                            },
+                            "type": "array"
+                        },
                         "LoadBalancerArn": {
                             "type": "string"
                         },
@@ -75486,6 +80779,18 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ElasticLoadBalancingV2::Listener.MutualAuthentication": {
             "additionalProperties": false,
             "properties": {
@@ -76949,6 +82254,31 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "RecordMatchingModel": {
+                    "type": "string"
+                },
+                "RuleDefinitionType": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "RecordMatchingModel"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdMappingWorkflow.IdMappingTechniques": {
             "additionalProperties": false,
             "properties": {
@@ -76957,6 +82287,9 @@ var CloudformationSchema = `{
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.ProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties"
                 }
             },
             "type": "object"
@@ -77030,6 +82363,25 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdNamespace": {
             "additionalProperties": false,
             "properties": {
@@ -77131,6 +82483,9 @@ var CloudformationSchema = `{
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties"
                 }
             },
             "required": [
@@ -77174,213 +82529,34 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow": {
+        "AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "AttributeMatchingModel": {
                     "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
-                            },
-                            "type": "array"
-                        },
-                        "OutputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
-                            },
-                            "type": "array"
-                        },
-                        "ResolutionTechniques": {
-                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "WorkflowName": {
-                            "type": "string"
-                        }
+                "RecordMatchingModels": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "InputSourceConfig",
-                        "OutputSourceConfig",
-                        "ResolutionTechniques",
-                        "RoleArn",
-                        "WorkflowName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::EntityResolution::MatchingWorkflow"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "InputSourceARN": {
-                    "type": "string"
-                },
-                "SchemaArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputSourceARN",
-                "SchemaArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "IntermediateS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
-            "additionalProperties": false,
-            "properties": {
-                "Hashed": {
-                    "type": "boolean"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "KMSArn": {
-                    "type": "string"
+                    "type": "array"
                 },
-                "Output": {
+                "RuleDefinitionTypes": {
                     "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "OutputS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Output",
-                "OutputS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateSourceConfiguration": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
-                },
-                "ProviderConfiguration": {
-                    "additionalProperties": true,
-                    "patternProperties": {
-                        "^[a-zA-Z0-9]+$": {
-                            "type": "string"
-                        }
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.Rule"
                     },
-                    "type": "object"
-                },
-                "ProviderServiceArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ProviderServiceArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
-            "additionalProperties": false,
-            "properties": {
-                "ProviderProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
-                },
-                "ResolutionType": {
-                    "type": "string"
-                },
-                "RuleBasedProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                    "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+        "AWS::EntityResolution::IdNamespace.Rule": {
             "additionalProperties": false,
             "properties": {
                 "MatchingKeys": {
@@ -77399,26 +82575,269 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "AttributeMatchingModel": {
-                    "type": "string"
-                },
-                "Rules": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AttributeMatchingModel",
-                "Rules"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::PolicyStatement": {
+        "AWS::EntityResolution::MatchingWorkflow": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IncrementalRunConfig": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig"
+                        },
+                        "InputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
+                            },
+                            "type": "array"
+                        },
+                        "OutputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
+                            },
+                            "type": "array"
+                        },
+                        "ResolutionTechniques": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputSourceConfig",
+                        "OutputSourceConfig",
+                        "ResolutionTechniques",
+                        "RoleArn",
+                        "WorkflowName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EntityResolution::MatchingWorkflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IncrementalRunType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IncrementalRunType"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "InputSourceARN": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSourceARN",
+                "SchemaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Hashed": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "KMSArn": {
+                    "type": "string"
+                },
+                "Output": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                    },
+                    "type": "array"
+                },
+                "OutputS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Output",
+                "OutputS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateSourceConfiguration": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
+                },
+                "ProviderConfiguration": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ProviderServiceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderServiceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
+                },
+                "ResolutionType": {
+                    "type": "string"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "MatchPurpose": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::PolicyStatement": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -77595,6 +83014,9 @@ var CloudformationSchema = `{
                 "GroupName": {
                     "type": "string"
                 },
+                "Hashed": {
+                    "type": "boolean"
+                },
                 "MatchKey": {
                     "type": "string"
                 },
@@ -78519,9 +83941,18 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Events::EventBus.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
                         "EventSourceName": {
                             "type": "string"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -78561,6 +83992,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Events::EventBus.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Events::EventBusPolicy": {
             "additionalProperties": false,
             "properties": {
@@ -80536,80 +85976,95 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::FMS::Policy.NetworkFirewallPolicy": {
+        "AWS::FMS::Policy.IcmpTypeCode": {
             "additionalProperties": false,
             "properties": {
-                "FirewallDeploymentModel": {
-                    "type": "string"
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
                 }
             },
             "required": [
-                "FirewallDeploymentModel"
+                "Code",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyOption": {
+        "AWS::FMS::Policy.NetworkAclCommonPolicy": {
             "additionalProperties": false,
             "properties": {
-                "NetworkFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
-                },
-                "ThirdPartyFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                "NetworkAclEntrySet": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntrySet"
                 }
             },
+            "required": [
+                "NetworkAclEntrySet"
+            ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyTag": {
+        "AWS::FMS::Policy.NetworkAclEntry": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CidrBlock": {
                     "type": "string"
                 },
-                "Value": {
+                "Egress": {
+                    "type": "boolean"
+                },
+                "IcmpTypeCode": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.IcmpTypeCode"
+                },
+                "Ipv6CidrBlock": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::FMS::Policy.ResourceTag": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PortRange"
+                },
+                "Protocol": {
                     "type": "string"
                 },
-                "Value": {
+                "RuleAction": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key"
+                "Egress",
+                "Protocol",
+                "RuleAction"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.SecurityServicePolicyData": {
+        "AWS::FMS::Policy.NetworkAclEntrySet": {
             "additionalProperties": false,
             "properties": {
-                "ManagedServiceData": {
-                    "type": "string"
+                "FirstEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 },
-                "PolicyOption": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                "ForceRemediateForFirstEntries": {
+                    "type": "boolean"
                 },
-                "Type": {
-                    "type": "string"
+                "ForceRemediateForLastEntries": {
+                    "type": "boolean"
+                },
+                "LastEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Type"
+                "ForceRemediateForFirstEntries",
+                "ForceRemediateForLastEntries"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
+        "AWS::FMS::Policy.NetworkFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
                 "FirewallDeploymentModel": {
@@ -80621,224 +86076,316 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::FMS::ResourceSet": {
+        "AWS::FMS::Policy.PolicyOption": {
             "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"
-                        }
-                    ]
+                "NetworkAclCommonPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclCommonPolicy"
                 },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ResourceTypeList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Resources": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "ResourceTypeList"
-                    ],
-                    "type": "object"
+                "NetworkFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::FMS::ResourceSet"
-                    ],
+                "ThirdPartyFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation": {
+        "AWS::FMS::Policy.PortRange": {
             "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": {
-                        "BatchImportMetaDataOnCreate": {
-                            "type": "boolean"
-                        },
-                        "DataRepositoryPath": {
-                            "type": "string"
-                        },
-                        "FileSystemId": {
-                            "type": "string"
-                        },
-                        "FileSystemPath": {
-                            "type": "string"
-                        },
-                        "ImportedFileChunkSize": {
-                            "type": "number"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DataRepositoryPath",
-                        "FileSystemId",
-                        "FileSystemPath"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::FSx::DataRepositoryAssociation"
-                    ],
-                    "type": "string"
+                "From": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "To": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "From",
+                "To"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+        "AWS::FMS::Policy.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+        "AWS::FMS::Policy.SecurityServicePolicyData": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ManagedServiceData": {
+                    "type": "string"
+                },
+                "PolicyOption": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.S3": {
+        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
-                "AutoExportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
-                },
-                "AutoImportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                "FirewallDeploymentModel": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "FirewallDeploymentModel"
+            ],
             "type": "object"
         },
-        "AWS::FSx::FileSystem": {
+        "AWS::FMS::ResourceSet": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ResourceTypeList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation": {
+            "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": {
+                        "BatchImportMetaDataOnCreate": {
+                            "type": "boolean"
+                        },
+                        "DataRepositoryPath": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "FileSystemPath": {
+                            "type": "string"
+                        },
+                        "ImportedFileChunkSize": {
+                            "type": "number"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataRepositoryPath",
+                        "FileSystemId",
+                        "FileSystemPath"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::DataRepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoExportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
+                },
+                "AutoImportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -81028,6 +86575,9 @@ var CloudformationSchema = `{
                 "ImportedFileChunkSize": {
                     "type": "number"
                 },
+                "MetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.MetadataConfiguration"
+                },
                 "PerUnitStorageThroughput": {
                     "type": "number"
                 },
@@ -81037,6 +86587,18 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::FSx::FileSystem.MetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::FSx::FileSystem.NfsExports": {
             "additionalProperties": false,
             "properties": {
@@ -84815,6 +90377,9 @@ var CloudformationSchema = `{
         "AWS::GlobalAccelerator::CrossAccountAttachment.Resource": {
             "additionalProperties": false,
             "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
                 "EndpointId": {
                     "type": "string"
                 },
@@ -84822,9 +90387,6 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "EndpointId"
-            ],
             "type": "object"
         },
         "AWS::GlobalAccelerator::EndpointGroup": {
@@ -85532,6 +91094,12 @@ var CloudformationSchema = `{
                 "ConnectionName": {
                     "type": "string"
                 },
+                "EnableAdditionalMetadata": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "Exclusions": {
                     "items": {
                         "type": "string"
@@ -85982,6 +91550,9 @@ var CloudformationSchema = `{
                         },
                         "DatabaseInput": {
                             "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -86264,9 +91835,18 @@ var CloudformationSchema = `{
                         "GlueVersion": {
                             "type": "string"
                         },
+                        "JobMode": {
+                            "type": "string"
+                        },
+                        "JobRunQueuingEnabled": {
+                            "type": "boolean"
+                        },
                         "LogUri": {
                             "type": "string"
                         },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
                         "MaxCapacity": {
                             "type": "number"
                         },
@@ -87892,7 +93472,7 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::Glue::Workflow": {
+        "AWS::Glue::UsageProfile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -87927,27 +93507,30 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultRunProperties": {
-                            "type": "object"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ProfileConfiguration"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "MaxConcurrentRuns": {
-                            "type": "number"
-                        },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "type": "object"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Glue::Workflow"
+                        "AWS::Glue::UsageProfile"
                     ],
                     "type": "string"
                 },
@@ -87961,11 +93544,130 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Grafana::Workspace": {
+        "AWS::Glue::UsageProfile.ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::UsageProfile.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JobConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SessionConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "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": {
+                        "DefaultRunProperties": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentRuns": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Grafana::Workspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91736,7 +97438,9 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "FindingCriteria"
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name"
                     ],
                     "type": "object"
                 },
@@ -91946,7 +97650,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Master": {
+        "AWS::GuardDuty::MalwareProtectionPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91981,25 +97685,31 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DetectorId": {
-                            "type": "string"
+                        "Actions": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNActions"
                         },
-                        "InvitationId": {
-                            "type": "string"
+                        "ProtectedResource": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource"
                         },
-                        "MasterId": {
+                        "Role": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.TagItem"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DetectorId",
-                        "MasterId"
+                        "ProtectedResource",
+                        "Role"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Master"
+                        "AWS::GuardDuty::MalwareProtectionPlan"
                     ],
                     "type": "string"
                 },
@@ -92018,7 +97728,80 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Member": {
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNActions": {
+            "additionalProperties": false,
+            "properties": {
+                "Tagging": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNTagging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.S3Bucket"
+                }
+            },
+            "required": [
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNTagging": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.S3Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "ObjectPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92056,30 +97839,22 @@ var CloudformationSchema = `{
                         "DetectorId": {
                             "type": "string"
                         },
-                        "DisableEmailNotification": {
-                            "type": "boolean"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "MemberId": {
-                            "type": "string"
-                        },
-                        "Message": {
+                        "InvitationId": {
                             "type": "string"
                         },
-                        "Status": {
+                        "MasterId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Email"
+                        "DetectorId",
+                        "MasterId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Member"
+                        "AWS::GuardDuty::Master"
                     ],
                     "type": "string"
                 },
@@ -92098,7 +97873,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet": {
+        "AWS::GuardDuty::Member": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92133,37 +97908,33 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Activate": {
-                            "type": "boolean"
-                        },
                         "DetectorId": {
                             "type": "string"
                         },
-                        "Format": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
                             "type": "string"
                         },
-                        "Location": {
+                        "MemberId": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Message": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
-                            },
-                            "type": "array"
+                        "Status": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "Location"
+                        "Email"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::ThreatIntelSet"
+                        "AWS::GuardDuty::Member"
                     ],
                     "type": "string"
                 },
@@ -92182,23 +97953,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::HealthImaging::Datastore": {
+        "AWS::GuardDuty::ThreatIntelSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92233,27 +97988,37 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DatastoreName": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
                             },
-                            "type": "object"
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Format",
+                        "Location"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::HealthImaging::Datastore"
+                        "AWS::GuardDuty::ThreatIntelSet"
                     ],
                     "type": "string"
                 },
@@ -92267,11 +98032,101 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::HealthLake::FHIRDatastore": {
+        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthImaging::Datastore": {
+            "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": {
+                        "DatastoreName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthImaging::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92888,9 +98743,6 @@ var CloudformationSchema = `{
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "ThumbprintList"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -92909,8 +98761,7 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -94086,7 +99937,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration": {
+        "AWS::IVS::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94121,36 +99972,24 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DestinationConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
-                        },
                         "Name": {
                             "type": "string"
                         },
-                        "RecordingReconnectWindowSeconds": {
-                            "type": "number"
-                        },
-                        "RenditionConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        "PublicKeyMaterial": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ThumbnailConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
-                    "required": [
-                        "DestinationConfiguration"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::RecordingConfiguration"
+                        "AWS::IVS::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -94164,69 +100003,11 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RenditionSelection": {
-                    "type": "string"
-                },
-                "Renditions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "BucketName": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "BucketName"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RecordingMode": {
-                    "type": "string"
-                },
-                "Resolution": {
-                    "type": "string"
-                },
-                "Storage": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TargetIntervalSeconds": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::Stage": {
+        "AWS::IVS::RecordingConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94261,21 +100042,36 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "RecordingReconnectWindowSeconds": {
+                            "type": "number"
+                        },
+                        "RenditionConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "ThumbnailConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::Stage"
+                        "AWS::IVS::RecordingConfiguration"
                     ],
                     "type": "string"
                 },
@@ -94289,85 +100085,36 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RenditionSelection": {
                     "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": {
-                        "Name": {
-                            "type": "string"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "Renditions": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "S3"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::IVS::StorageConfiguration"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "BucketName": {
@@ -94379,7 +100126,202 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::IVS::StreamKey": {
+        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordingMode": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                },
+                "Storage": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetIntervalSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::Stage": {
+            "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": {
+                        "AutoParticipantRecordingConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::Stage.AutoParticipantRecordingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Stage.AutoParticipantRecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MediaTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StorageConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StorageConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -96814,6 +102756,12 @@ var CloudformationSchema = `{
                             "$ref": "#/definitions/AWS::InspectorV2::CisScanConfiguration.CisTargets"
                         }
                     },
+                    "required": [
+                        "ScanName",
+                        "Schedule",
+                        "SecurityLevel",
+                        "Targets"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -96832,7 +102780,8 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -98495,9 +104444,18 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ApplicationProtocol": {
+                            "type": "string"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
                         "AuthorizerConfig": {
                             "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
                         },
+                        "ClientCertificateConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.ClientCertificateConfig"
+                        },
                         "DomainConfigurationName": {
                             "type": "string"
                         },
@@ -98566,6 +104524,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::IoT::DomainConfiguration.ClientCertificateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientCertificateCallbackArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::IoT::DomainConfiguration.ServerCertificateConfig": {
             "additionalProperties": false,
             "properties": {
@@ -104021,6 +109988,12 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "SignalsToFetch": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchInformation"
+                            },
+                            "type": "array"
+                        },
                         "SpoolingMode": {
                             "type": "string"
                         },
@@ -104038,7 +110011,6 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "Action",
                         "CollectionScheme",
                         "Name",
                         "SignalCatalogArn",
@@ -104100,9 +110072,28 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                },
+                "TriggerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression",
+                "TriggerMode"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.DataDestinationConfig": {
             "additionalProperties": false,
             "properties": {
+                "MqttTopicConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.MqttTopicConfig"
+                },
                 "S3Config": {
                     "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.S3Config"
                 },
@@ -104112,6 +110103,22 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.MqttTopicConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "MqttTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "MqttTopicArn"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.S3Config": {
             "additionalProperties": false,
             "properties": {
@@ -104133,6 +110140,44 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.SignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig"
+                },
+                "TimeBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTFleetWise::Campaign.SignalFetchInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConditionLanguageVersion": {
+                    "type": "number"
+                },
+                "FullyQualifiedName": {
+                    "type": "string"
+                },
+                "SignalFetchConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchConfig"
+                }
+            },
+            "required": [
+                "Actions",
+                "FullyQualifiedName",
+                "SignalFetchConfig"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.SignalInformation": {
             "additionalProperties": false,
             "properties": {
@@ -104163,6 +110208,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionFrequencyMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutionFrequencyMs"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.TimestreamConfig": {
             "additionalProperties": false,
             "properties": {
@@ -111040,6 +117097,75 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Kinesis::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "ResourcePolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kinesis::Stream": {
             "additionalProperties": false,
             "properties": {
@@ -111954,6 +118080,9 @@ var CloudformationSchema = `{
                 "ApplicationSnapshotConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
                 },
+                "ApplicationSystemRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration"
+                },
                 "EnvironmentProperties": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
                 },
@@ -112014,6 +118143,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RollbackEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "RollbackEnabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
             "additionalProperties": false,
             "properties": {
@@ -112976,6 +119117,9 @@ var CloudformationSchema = `{
                         "HttpEndpointDestinationConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
                         },
+                        "IcebergDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration"
+                        },
                         "KinesisStreamSourceConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
                         },
@@ -113187,6 +119331,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113265,6 +119418,31 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDatabaseName": {
+                    "type": "string"
+                },
+                "DestinationTableName": {
+                    "type": "string"
+                },
+                "S3ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "UniqueKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DestinationDatabaseName",
+                "DestinationTableName"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.DocumentIdOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113505,6 +119683,9 @@ var CloudformationSchema = `{
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
@@ -113528,6 +119709,47 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "DestinationTableConfigurationList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration"
+                    },
+                    "type": "array"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "s3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CatalogConfiguration",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -113574,6 +119796,9 @@ var CloudformationSchema = `{
                 "MSKClusterARN": {
                     "type": "string"
                 },
+                "ReadFromTimestamp": {
+                    "type": "string"
+                },
                 "TopicName": {
                     "type": "string"
                 }
@@ -113760,6 +119985,9 @@ var CloudformationSchema = `{
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "Username": {
                     "type": "string"
                 }
@@ -113767,10 +119995,8 @@ var CloudformationSchema = `{
             "required": [
                 "ClusterJDBCURL",
                 "CopyCommand",
-                "Password",
                 "RoleARN",
-                "S3Configuration",
-                "Username"
+                "S3Configuration"
             ],
             "type": "object"
         },
@@ -113850,6 +120076,24 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecretARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.Serializer": {
             "additionalProperties": false,
             "properties": {
@@ -113862,12 +120106,27 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.SnowflakeDestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "AccountUrl": {
                     "type": "string"
                 },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints"
+                },
                 "CloudWatchLoggingOptions": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
                 },
@@ -113907,6 +120166,9 @@ var CloudformationSchema = `{
                 "Schema": {
                     "type": "string"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "SnowflakeRoleConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeRoleConfiguration"
                 },
@@ -113923,12 +120185,10 @@ var CloudformationSchema = `{
             "required": [
                 "AccountUrl",
                 "Database",
-                "PrivateKey",
                 "RoleARN",
                 "S3Configuration",
                 "Schema",
-                "Table",
-                "User"
+                "Table"
             ],
             "type": "object"
         },
@@ -114009,12 +120269,14 @@ var CloudformationSchema = `{
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
                 "HECEndpoint",
                 "HECEndpointType",
-                "HECToken",
                 "S3Configuration"
             ],
             "type": "object"
@@ -115383,9 +121645,6 @@ var CloudformationSchema = `{
                     "type": "array"
                 }
             },
-            "required": [
-                "AdditionalVersionWeights"
-            ],
             "type": "object"
         },
         "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
@@ -115459,6 +121718,12 @@ var CloudformationSchema = `{
                         },
                         "Description": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -115696,6 +121961,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
                         "MaximumBatchingWindowInSeconds": {
                             "type": "number"
                         },
@@ -115735,6 +122003,12 @@ var CloudformationSchema = `{
                         "StartingPositionTimestamp": {
                             "type": "number"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "Topics": {
                             "items": {
                                 "type": "string"
@@ -115977,6 +122251,9 @@ var CloudformationSchema = `{
                         "PackageType": {
                             "type": "string"
                         },
+                        "RecursiveLoop": {
+                            "type": "string"
+                        },
                         "ReservedConcurrentExecutions": {
                             "type": "number"
                         },
@@ -116050,6 +122327,9 @@ var CloudformationSchema = `{
                 "S3ObjectVersion": {
                     "type": "string"
                 },
+                "SourceKMSKeyArn": {
+                    "type": "string"
+                },
                 "ZipFile": {
                     "type": "string"
                 }
@@ -116643,6 +122923,9 @@ var CloudformationSchema = `{
                         "FunctionName": {
                             "type": "string"
                         },
+                        "Policy": {
+                            "type": "object"
+                        },
                         "ProvisionedConcurrencyConfig": {
                             "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
                         },
@@ -116703,6 +122986,110 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::LaunchWizard::Deployment": {
+            "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": {
+                        "DeploymentPatternName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Specifications": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LaunchWizard::Deployment.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "WorkloadName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeploymentPatternName",
+                        "Name",
+                        "Specifications",
+                        "WorkloadName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LaunchWizard::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LaunchWizard::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
         "AWS::Lex::Bot": {
             "additionalProperties": false,
             "properties": {
@@ -124208,6 +130595,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::MSK::Replicator.ReplicationTopicNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MSK::Replicator.TopicReplication": {
             "additionalProperties": false,
             "properties": {
@@ -124223,6 +130619,9 @@ var CloudformationSchema = `{
                 "StartingPosition": {
                     "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationStartingPosition"
                 },
+                "TopicNameConfiguration": {
+                    "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationTopicNameConfiguration"
+                },
                 "TopicsToExclude": {
                     "items": {
                         "type": "string"
@@ -124538,9 +130937,15 @@ var CloudformationSchema = `{
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
                         },
+                        "MaxWebservers": {
+                            "type": "number"
+                        },
                         "MaxWorkers": {
                             "type": "number"
                         },
+                        "MinWebservers": {
+                            "type": "number"
+                        },
                         "MinWorkers": {
                             "type": "number"
                         },
@@ -125927,6 +132332,15 @@ var CloudformationSchema = `{
                         "AvailabilityZone": {
                             "type": "string"
                         },
+                        "Maintenance": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Maintenance"
+                        },
+                        "MediaStreams": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStream"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -125935,6 +132349,15 @@ var CloudformationSchema = `{
                         },
                         "SourceFailoverConfig": {
                             "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        },
+                        "SourceMonitoringConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.SourceMonitoringConfig"
+                        },
+                        "VpcInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.VpcInterface"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -126018,6 +132441,33 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.Fmtp": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelOrder": {
+                    "type": "string"
+                },
+                "Colorimetry": {
+                    "type": "string"
+                },
+                "ExactFramerate": {
+                    "type": "string"
+                },
+                "Par": {
+                    "type": "string"
+                },
+                "Range": {
+                    "type": "string"
+                },
+                "ScanMode": {
+                    "type": "string"
+                },
+                "Tcs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.GatewayBridgeSource": {
             "additionalProperties": false,
             "properties": {
@@ -126033,6 +132483,119 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.InputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Interface"
+                }
+            },
+            "required": [
+                "InputPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Maintenance": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceDay": {
+                    "type": "string"
+                },
+                "MaintenanceStartHour": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaintenanceDay",
+                "MaintenanceStartHour"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamAttributes"
+                },
+                "ClockRate": {
+                    "type": "number"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Fmt": {
+                    "type": "number"
+                },
+                "MediaStreamId": {
+                    "type": "number"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                },
+                "MediaStreamType": {
+                    "type": "string"
+                },
+                "VideoFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MediaStreamId",
+                "MediaStreamName",
+                "MediaStreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Fmtp": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Fmtp"
+                },
+                "Lang": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingName": {
+                    "type": "string"
+                },
+                "InputConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.InputConfiguration"
+                    },
+                    "type": "array"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.Source": {
             "additionalProperties": false,
             "properties": {
@@ -126060,6 +132623,15 @@ var CloudformationSchema = `{
                 "MaxLatency": {
                     "type": "number"
                 },
+                "MaxSyncBuffer": {
+                    "type": "number"
+                },
+                "MediaStreamSourceConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamSourceConfiguration"
+                    },
+                    "type": "array"
+                },
                 "MinLatency": {
                     "type": "number"
                 },
@@ -126099,154 +132671,202 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.SourcePriority": {
+        "AWS::MediaConnect::Flow.SourceMonitoringConfig": {
             "additionalProperties": false,
             "properties": {
-                "PrimarySource": {
+                "ThumbnailState": {
                     "type": "string"
                 }
             },
             "required": [
-                "PrimarySource"
+                "ThumbnailState"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
+        "AWS::MediaConnect::Flow.SourcePriority": {
             "additionalProperties": false,
             "properties": {
-                "VpcInterfaceName": {
+                "PrimarySource": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PrimarySource"
+            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement": {
+        "AWS::MediaConnect::Flow.VpcInterface": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Name": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "NetworkInterfaceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "NetworkInterfaceType": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "RoleArn": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DataTransferSubscriberFeePercent": {
-                            "type": "number"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Encryption": {
-                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
-                        },
-                        "EntitlementStatus": {
-                            "type": "string"
-                        },
-                        "FlowArn": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Description",
-                        "FlowArn",
-                        "Name",
-                        "Subscribers"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::MediaConnect::FlowEntitlement"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "SubnetId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "RoleArn",
+                "SecurityGroupIds",
+                "SubnetId"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
-                "Algorithm": {
-                    "type": "string"
-                },
-                "ConstantInitializationVector": {
-                    "type": "string"
-                },
-                "DeviceId": {
-                    "type": "string"
-                },
-                "KeyType": {
-                    "type": "string"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "ResourceId": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                },
-                "SecretArn": {
-                    "type": "string"
-                },
-                "Url": {
+                "VpcInterfaceName": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Algorithm",
-                "RoleArn"
-            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowOutput": {
+        "AWS::MediaConnect::FlowEntitlement": {
+            "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": {
+                        "DataTransferSubscriberFeePercent": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
+                        },
+                        "EntitlementStatus": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "FlowArn",
+                        "Name",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowEntitlement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "DeviceId": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Algorithm",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -126302,12 +132922,21 @@ var CloudformationSchema = `{
                         "MaxLatency": {
                             "type": "number"
                         },
+                        "MediaStreamOutputConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "MinLatency": {
                             "type": "number"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "OutputStatus": {
+                            "type": "string"
+                        },
                         "Port": {
                             "type": "number"
                         },
@@ -126354,6 +132983,41 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationIp": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Interface"
+                }
+            },
+            "required": [
+                "DestinationIp",
+                "DestinationPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.EncodingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFactor": {
+                    "type": "number"
+                },
+                "EncoderProfile": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionFactor"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -126376,6 +133040,43 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.DestinationConfiguration"
+                    },
+                    "type": "array"
+                },
+                "EncodingName": {
+                    "type": "string"
+                },
+                "EncodingParameters": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.EncodingParameters"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
@@ -127533,6 +134234,9 @@ var CloudformationSchema = `{
             "properties": {
                 "AvailSettings": {
                     "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                },
+                "Scte35SegmentationScope": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -128459,6 +135163,9 @@ var CloudformationSchema = `{
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "NumRefFrames": {
                     "type": "number"
                 },
@@ -128606,6 +135313,9 @@ var CloudformationSchema = `{
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "MvOverPictureBoundaries": {
                     "type": "string"
                 },
@@ -130315,7 +137025,7 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaLive::Input": {
+        "AWS::MediaLive::ChannelPlacementGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130350,57 +137060,30 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
-                            },
-                            "type": "array"
+                        "ClusterId": {
+                            "type": "string"
                         },
-                        "InputDevices": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
-                            },
-                            "type": "array"
+                        "Name": {
+                            "type": "string"
                         },
-                        "InputSecurityGroups": {
+                        "Nodes": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "MediaConnectFlows": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Sources": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                                "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup.Tags"
                             },
                             "type": "array"
-                        },
-                        "Tags": {
-                            "type": "object"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "Vpc": {
-                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
                         }
                     },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Input"
+                        "AWS::MediaLive::ChannelPlacementGroup"
                     ],
                     "type": "string"
                 },
@@ -130418,76 +137101,727 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Input.InputDestinationRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "StreamName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputSourceRequest": {
+        "AWS::MediaLive::ChannelPlacementGroup.Tags": {
             "additionalProperties": false,
             "properties": {
-                "PasswordParam": {
-                    "type": "string"
-                },
-                "Url": {
+                "Key": {
                     "type": "string"
                 },
-                "Username": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputVpcRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "SecurityGroupIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "SubnetIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "FlowArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::InputSecurityGroup": {
+        "AWS::MediaLive::CloudWatchAlarmTemplate": {
+            "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": {
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetResourceType": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods",
+                        "GroupIdentifier",
+                        "MetricName",
+                        "Name",
+                        "Period",
+                        "Statistic",
+                        "TargetResourceType",
+                        "Threshold",
+                        "TreatMissingData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::CloudWatchAlarmTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster": {
+            "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": {
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster.ClusterNetworkSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Cluster.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.ClusterNetworkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRoute": {
+                    "type": "string"
+                },
+                "InterfaceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Cluster.InterfaceMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.InterfaceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalInterfaceName": {
+                    "type": "string"
+                },
+                "NetworkId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventTargets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget"
+                            },
+                            "type": "array"
+                        },
+                        "EventType": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "EventType",
+                        "GroupIdentifier",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "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": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "InputDevices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
+                            },
+                            "type": "array"
+                        },
+                        "InputSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MediaConnectFlows": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                            },
+                            "type": "array"
+                        },
+                        "SrtSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.SrtSettingsRequest"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDestinationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputVpcRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerDecryptionRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "PassphraseSecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerDecryptionRequest"
+                },
+                "MinimumLatency": {
+                    "type": "number"
+                },
+                "SrtListenerAddress": {
+                    "type": "string"
+                },
+                "SrtListenerPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtSettingsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SrtCallerSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerSourceRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130598,41 +137932,500 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
-                            },
-                            "type": "array"
-                        },
-                        "MultiplexSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "MultiplexSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZones",
+                        "MultiplexSettings",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntitlementArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexMediaConnectOutputDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumVideoBufferDelayMilliseconds": {
+                    "type": "number"
+                },
+                "TransportStreamBitrate": {
+                    "type": "number"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "TransportStreamReservedBitrate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TransportStreamBitrate",
+                "TransportStreamId"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram": {
+            "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": {
+                        "MultiplexId": {
+                            "type": "string"
+                        },
+                        "MultiplexProgramSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
+                        },
+                        "PacketIdentifiersMap": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        },
+                        "PipelineDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredChannelPipeline": {
+                            "type": "string"
+                        },
+                        "ProgramName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplexprogram"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbSubPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbTeletextPid": {
+                    "type": "number"
+                },
+                "EtvPlatformPid": {
+                    "type": "number"
+                },
+                "EtvSignalPid": {
+                    "type": "number"
+                },
+                "KlvDataPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "PcrPid": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "number"
+                },
+                "PrivateMetadataPid": {
+                    "type": "number"
+                },
+                "Scte27Pids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Scte35Pid": {
+                    "type": "number"
+                },
+                "TimedMetadataPid": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveChannelPipeline": {
+                    "type": "string"
+                },
+                "PipelineId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PreferredChannelPipeline": {
+                    "type": "string"
+                },
+                "ProgramNumber": {
+                    "type": "number"
+                },
+                "ServiceDescriptor": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
+                },
+                "VideoSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                }
+            },
+            "required": [
+                "ProgramNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumBitrate": {
+                    "type": "number"
+                },
+                "MinimumBitrate": {
+                    "type": "number"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantBitrate": {
+                    "type": "number"
+                },
+                "StatmuxSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network": {
+            "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": {
+                        "IpPools": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.IpPool"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Routes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Route"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpPools",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Network"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.IpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Route": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Gateway": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::SdiSource": {
+            "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": {
+                        "Mode": {
+                            "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                                "$ref": "#/definitions/AWS::MediaLive::SdiSource.Tags"
                             },
                             "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AvailabilityZones",
-                        "MultiplexSettings",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplex"
+                        "AWS::MediaLive::SdiSource"
                     ],
                     "type": "string"
                 },
@@ -130651,47 +138444,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "EntitlementArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
-            "additionalProperties": false,
-            "properties": {
-                "MultiplexMediaConnectOutputDestinationSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumVideoBufferDelayMilliseconds": {
-                    "type": "number"
-                },
-                "TransportStreamBitrate": {
-                    "type": "number"
-                },
-                "TransportStreamId": {
-                    "type": "number"
-                },
-                "TransportStreamReservedBitrate": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "TransportStreamBitrate",
-                "TransportStreamId"
-            ],
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.Tags": {
+        "AWS::MediaLive::SdiSource.Tags": {
             "additionalProperties": false,
             "properties": {
                 "Key": {
@@ -130703,7 +138456,7 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram": {
+        "AWS::MediaLive::SignalMap": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130738,36 +138491,49 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ChannelId": {
-                            "type": "string"
+                        "CloudWatchAlarmTemplateGroupIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "MultiplexId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MultiplexProgramSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
-                        },
-                        "PacketIdentifiersMap": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        "DiscoveryEntryPointArn": {
+                            "type": "string"
                         },
-                        "PipelineDetails": {
+                        "EventBridgeRuleTemplateGroupIdentifiers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "PreferredChannelPipeline": {
-                            "type": "string"
+                        "ForceRediscovery": {
+                            "type": "boolean"
                         },
-                        "ProgramName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
+                    "required": [
+                        "DiscoveryEntryPointArn",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplexprogram"
+                        "AWS::MediaLive::SignalMap"
                     ],
                     "type": "string"
                 },
@@ -130781,143 +138547,81 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+        "AWS::MediaLive::SignalMap.MediaResource": {
             "additionalProperties": false,
             "properties": {
-                "AudioPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbSubPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbTeletextPid": {
-                    "type": "number"
-                },
-                "EtvPlatformPid": {
-                    "type": "number"
-                },
-                "EtvSignalPid": {
-                    "type": "number"
-                },
-                "KlvDataPids": {
+                "Destinations": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
                 },
-                "PcrPid": {
-                    "type": "number"
-                },
-                "PmtPid": {
-                    "type": "number"
-                },
-                "PrivateMetadataPid": {
-                    "type": "number"
+                "Name": {
+                    "type": "string"
                 },
-                "Scte27Pids": {
+                "Sources": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
-                },
-                "Scte35Pid": {
-                    "type": "number"
-                },
-                "TimedMetadataPid": {
-                    "type": "number"
-                },
-                "VideoPid": {
-                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+        "AWS::MediaLive::SignalMap.MediaResourceNeighbor": {
             "additionalProperties": false,
             "properties": {
-                "ActiveChannelPipeline": {
+                "Arn": {
                     "type": "string"
                 },
-                "PipelineId": {
+                "Name": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Arn"
+            ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+        "AWS::MediaLive::SignalMap.MonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "ProviderName": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ServiceName": {
+                "ErrorMessage": {
+                    "type": "string"
+                },
+                "Status": {
                     "type": "string"
                 }
             },
             "required": [
-                "ProviderName",
-                "ServiceName"
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+        "AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "PreferredChannelPipeline": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ProgramNumber": {
-                    "type": "number"
-                },
-                "ServiceDescriptor": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
-                },
-                "VideoSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                "Status": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ProgramNumber"
+                "DetailsUri",
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumBitrate": {
-                    "type": "number"
-                },
-                "MinimumBitrate": {
-                    "type": "number"
-                },
-                "Priority": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "ConstantBitrate": {
-                    "type": "number"
-                },
-                "StatmuxSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
-                }
-            },
-            "type": "object"
-        },
         "AWS::MediaPackage::Asset": {
             "additionalProperties": false,
             "properties": {
@@ -132107,6 +139811,9 @@ var CloudformationSchema = `{
                         "Description": {
                             "type": "string"
                         },
+                        "InputType": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -132344,9 +140051,18 @@ var CloudformationSchema = `{
                         "ContainerType": {
                             "type": "string"
                         },
+                        "DashManifests": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Description": {
                             "type": "string"
                         },
+                        "ForceEndpointErrorConfiguration": {
+                            "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration"
+                        },
                         "HlsManifests": {
                             "items": {
                                 "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration"
@@ -132378,6 +140094,7 @@ var CloudformationSchema = `{
                     "required": [
                         "ChannelGroupName",
                         "ChannelName",
+                        "ContainerType",
                         "OriginEndpointName"
                     ],
                     "type": "object"
@@ -132403,6 +140120,63 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DrmSignaling": {
+                    "type": "string"
+                },
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.FilterConfiguration"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScteDash": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ScteDash"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming"
+                }
+            },
+            "required": [
+                "ManifestName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming": {
+            "additionalProperties": false,
+            "properties": {
+                "TimingMode": {
+                    "type": "string"
+                },
+                "TimingSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -132471,6 +140245,18 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointErrorConditions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -132543,6 +140329,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ScteDash": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkerDash": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.ScteHls": {
             "additionalProperties": false,
             "properties": {
@@ -133335,6 +141130,9 @@ var CloudformationSchema = `{
         "AWS::MediaTailor::PlaybackConfiguration.AvailSuppression": {
             "additionalProperties": false,
             "properties": {
+                "FillPolicy": {
+                    "type": "string"
+                },
                 "Mode": {
                     "type": "string"
                 },
@@ -134188,102 +141986,312 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AssociatedRoles": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
-                            },
-                            "type": "array"
-                        },
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BackupRetentionPeriod": {
-                            "type": "number"
-                        },
-                        "CopyTagsToSnapshot": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBInstanceParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBPort": {
+                            "type": "number"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ServerlessScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBClusterParameterGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBInstance": {
+            "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": {
+                        "AllowMajorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBClusterParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBInstanceParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBPort": {
-                            "type": "number"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
-                        },
-                        "DeletionProtection": {
+                        "AutoMinorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "EnableCloudwatchLogsExports": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "EngineVersion": {
+                        "AvailabilityZone": {
                             "type": "string"
                         },
-                        "IamAuthEnabled": {
-                            "type": "boolean"
-                        },
-                        "KmsKeyId": {
+                        "DBClusterIdentifier": {
                             "type": "string"
                         },
-                        "PreferredBackupWindow": {
+                        "DBInstanceClass": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
+                        "DBInstanceIdentifier": {
                             "type": "string"
                         },
-                        "RestoreToTime": {
+                        "DBParameterGroupName": {
                             "type": "string"
                         },
-                        "RestoreType": {
+                        "DBSnapshotIdentifier": {
                             "type": "string"
                         },
-                        "ServerlessScalingConfiguration": {
-                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
-                        },
-                        "SnapshotIdentifier": {
+                        "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "SourceDBClusterIdentifier": {
+                        "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
-                        "StorageEncrypted": {
-                            "type": "boolean"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UseLatestRestorableTime": {
-                            "type": "boolean"
-                        },
-                        "VpcSecurityGroupIds": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBCluster"
+                        "AWS::Neptune::DBInstance"
                     ],
                     "type": "string"
                 },
@@ -134297,42 +142305,12 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.DBClusterRole": {
-            "additionalProperties": false,
-            "properties": {
-                "FeatureName": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RoleArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxCapacity": {
-                    "type": "number"
-                },
-                "MinCapacity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "MaxCapacity",
-                "MinCapacity"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBClusterParameterGroup": {
+        "AWS::Neptune::DBParameterGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134395,7 +142373,7 @@ var CloudformationSchema = `{
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBClusterParameterGroup"
+                        "AWS::Neptune::DBParameterGroup"
                     ],
                     "type": "string"
                 },
@@ -134414,7 +142392,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBInstance": {
+        "AWS::Neptune::DBSubnetGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134449,115 +142427,17 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowMajorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AutoMinorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AvailabilityZone": {
-                            "type": "string"
-                        },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBInstanceClass": {
-                            "type": "string"
-                        },
-                        "DBInstanceIdentifier": {
-                            "type": "string"
-                        },
-                        "DBParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBSnapshotIdentifier": {
+                        "DBSubnetGroupDescription": {
                             "type": "string"
                         },
                         "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DBInstanceClass"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Neptune::DBInstance"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBParameterGroup": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
+                        "SubnetIds": {
                             "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
                                 "type": "string"
                             },
                             "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Family": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "type": "object"
                         },
                         "Tags": {
                             "items": {
@@ -134567,15 +142447,14 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "Description",
-                        "Family",
-                        "Parameters"
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBParameterGroup"
+                        "AWS::Neptune::DBSubnetGroup"
                     ],
                     "type": "string"
                 },
@@ -134594,7 +142473,7 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBSubnetGroup": {
+        "AWS::Neptune::EventSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134629,34 +142508,33 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DBSubnetGroupDescription": {
-                            "type": "string"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
+                        "Enabled": {
+                            "type": "boolean"
                         },
-                        "SubnetIds": {
+                        "EventCategories": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Tags": {
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DBSubnetGroupDescription",
-                        "SubnetIds"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBSubnetGroup"
+                        "AWS::Neptune::EventSubscription"
                     ],
                     "type": "string"
                 },
@@ -134670,8 +142548,7 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -135137,6 +143014,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts": {
+            "additionalProperties": false,
+            "properties": {
+                "TcpIdleTimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::FirewallPolicy.IPSet": {
             "additionalProperties": false,
             "properties": {
@@ -135182,6 +143068,9 @@ var CloudformationSchema = `{
         "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
             "additionalProperties": false,
             "properties": {
+                "FlowTimeouts": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts"
+                },
                 "RuleOrder": {
                     "type": "string"
                 },
@@ -136087,39 +143976,311 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CoreNetworkId": {
+                        "CoreNetworkId": {
+                            "type": "string"
+                        },
+                        "EdgeLocation": {
+                            "type": "string"
+                        },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange"
+                        },
+                        "ProposedSegmentChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CoreNetworkId",
+                        "EdgeLocation",
+                        "Options",
+                        "TransportAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "SegmentName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer": {
+            "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": {
+                        "BgpOptions": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
+                        },
+                        "ConnectAttachmentId": {
+                            "type": "string"
+                        },
+                        "CoreNetworkAddress": {
+                            "type": "string"
+                        },
+                        "InsideCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PeerAddress": {
+                            "type": "string"
+                        },
+                        "SubnetArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectAttachmentId",
+                        "PeerAddress"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectPeer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "CoreNetworkAsn": {
+                    "type": "number"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BgpConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
+                    },
+                    "type": "array"
+                },
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "InsideCidrBlocks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::CoreNetwork": {
+            "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": {
+                        "Description": {
                             "type": "string"
                         },
-                        "EdgeLocation": {
+                        "GlobalNetworkId": {
                             "type": "string"
                         },
-                        "Options": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
-                        },
-                        "ProposedSegmentChange": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        "PolicyDocument": {
+                            "type": "object"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TransportAttachmentId": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "CoreNetworkId",
-                        "EdgeLocation",
-                        "Options",
-                        "TransportAttachmentId"
+                        "GlobalNetworkId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::NetworkManager::ConnectAttachment"
+                        "AWS::NetworkManager::CoreNetwork"
                     ],
                     "type": "string"
                 },
@@ -136138,264 +144299,55 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "Protocol": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
             "additionalProperties": false,
             "properties": {
-                "AttachmentPolicyRuleNumber": {
+                "Asn": {
                     "type": "number"
                 },
-                "SegmentName": {
+                "EdgeLocation": {
                     "type": "string"
                 },
-                "Tags": {
+                "InsideCidrBlocks": {
                     "items": {
-                        "$ref": "#/definitions/Tag"
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectPeer": {
-            "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": {
-                        "BgpOptions": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
-                        },
-                        "ConnectAttachmentId": {
-                            "type": "string"
-                        },
-                        "CoreNetworkAddress": {
-                            "type": "string"
-                        },
-                        "InsideCidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "PeerAddress": {
-                            "type": "string"
-                        },
-                        "SubnetArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "ConnectAttachmentId",
-                        "PeerAddress"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::ConnectPeer"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "CoreNetworkAsn": {
-                    "type": "number"
-                },
-                "PeerAddress": {
-                    "type": "string"
-                },
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup": {
             "additionalProperties": false,
             "properties": {
-                "BgpConfigurations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
-                    },
-                    "type": "array"
-                },
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "InsideCidrBlocks": {
+                "EdgeLocations": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "PeerAddress": {
+                "Name": {
                     "type": "string"
                 },
-                "Protocol": {
-                    "type": "string"
+                "Segments": {
+                    "$ref": "#/definitions/AWS::NetworkManager::CoreNetwork.Segments"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
             "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "GlobalNetworkId": {
-                            "type": "string"
-                        },
-                        "PolicyDocument": {
-                            "type": "object"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "EdgeLocations": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "GlobalNetworkId"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::CoreNetwork"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
-            "additionalProperties": false,
-            "properties": {
-                "Asn": {
-                    "type": "number"
+                    "type": "array"
                 },
-                "EdgeLocation": {
+                "Name": {
                     "type": "string"
                 },
-                "InsideCidrBlocks": {
+                "SharedSegments": {
                     "items": {
                         "type": "string"
                     },
@@ -136404,19 +144356,16 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
+        "AWS::NetworkManager::CoreNetwork.Segments": {
             "additionalProperties": false,
             "properties": {
-                "EdgeLocations": {
+                "SendTo": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Name": {
-                    "type": "string"
-                },
-                "SharedSegments": {
+                "SendVia": {
                     "items": {
                         "type": "string"
                     },
@@ -136999,6 +144948,12 @@ var CloudformationSchema = `{
                         "CoreNetworkId": {
                             "type": "string"
                         },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange"
                         },
@@ -137039,6 +144994,24 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137236,9 +145209,15 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
                         "PeeringId": {
                             "type": "string"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange"
                         },
@@ -137279,6 +145258,24 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137338,6 +145335,9 @@ var CloudformationSchema = `{
                         "Options": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.VpcOptions"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedSegmentChange"
                         },
@@ -137385,6 +145385,24 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::VpcAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -138201,6 +146219,22 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::OSIS::Pipeline.VpcAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachToVpc": {
+                    "type": "boolean"
+                },
+                "CidrBlock": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachToVpc",
+                "CidrBlock"
+            ],
+            "type": "object"
+        },
         "AWS::OSIS::Pipeline.VpcEndpoint": {
             "additionalProperties": false,
             "properties": {
@@ -138230,6 +146264,12 @@ var CloudformationSchema = `{
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "VpcAttachmentOptions": {
+                    "$ref": "#/definitions/AWS::OSIS::Pipeline.VpcAttachmentOptions"
+                },
+                "VpcEndpointManagement": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -139640,6 +147680,9 @@ var CloudformationSchema = `{
                         "OffPeakWindowOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.OffPeakWindowOptions"
                         },
+                        "SkipShardMigrationWait": {
+                            "type": "boolean"
+                        },
                         "SnapshotOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
                         },
@@ -139693,6 +147736,9 @@ var CloudformationSchema = `{
                 "InternalUserDatabaseEnabled": {
                     "type": "boolean"
                 },
+                "JWTOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.JWTOptions"
+                },
                 "MasterUserOptions": {
                     "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
                 },
@@ -139841,6 +147887,24 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::OpenSearchService::Domain.JWTOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "PublicKey": {
+                    "type": "string"
+                },
+                "RolesKey": {
+                    "type": "string"
+                },
+                "SubjectKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::OpenSearchService::Domain.LogPublishingOption": {
             "additionalProperties": false,
             "properties": {
@@ -142780,6 +150844,200 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::PCAConnectorSCEP::Challenge": {
+            "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": {
+                        "ConnectorArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConnectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Challenge"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector": {
+            "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": {
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "MobileDeviceManagement": {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Connector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.IntuneConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AzureApplicationId": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AzureApplicationId",
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "Intune": {
+                    "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.IntuneConfiguration"
+                }
+            },
+            "required": [
+                "Intune"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Panorama::ApplicationInstance": {
             "additionalProperties": false,
             "properties": {
@@ -146771,6 +155029,9 @@ var CloudformationSchema = `{
                         "EnrichmentParameters": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeEnrichmentParameters"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "LogConfiguration": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeLogConfiguration"
                         },
@@ -146975,6 +155236,26 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValue": {
+                    "type": "string"
+                },
+                "DimensionValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName",
+                "DimensionValue",
+                "DimensionValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.EcsContainerOverride": {
             "additionalProperties": false,
             "properties": {
@@ -147172,6 +155453,45 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValue",
+                "MeasureValueType",
+                "MultiMeasureAttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Pipes::Pipe.MultiMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings",
+                "MultiMeasureName"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.NetworkConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -147702,6 +156022,9 @@ var CloudformationSchema = `{
                 },
                 "StepFunctionStateMachineParameters": {
                     "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetStateMachineParameters"
+                },
+                "TimestreamParameters": {
+                    "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetTimestreamParameters"
                 }
             },
             "type": "object"
@@ -147770,6 +156093,50 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.PipeTargetTimestreamParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "EpochTimeUnit": {
+                    "type": "string"
+                },
+                "MultiMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "SingleMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.SingleMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "TimeFieldType": {
+                    "type": "string"
+                },
+                "TimeValue": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                },
+                "VersionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionMappings",
+                "TimeValue",
+                "VersionValue"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.PlacementConstraint": {
             "additionalProperties": false,
             "properties": {
@@ -147864,6 +156231,26 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.SingleMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureName",
+                "MeasureValue",
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Proton::EnvironmentAccountConnection": {
             "additionalProperties": false,
             "properties": {
@@ -148104,6 +156491,975 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QBusiness::Application": {
+            "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": {
+                        "AttachmentsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AttachmentsConfiguration"
+                        },
+                        "AutoSubscriptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AutoSubscriptionConfiguration"
+                        },
+                        "ClientIdsForOIDC": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.EncryptionConfiguration"
+                        },
+                        "IamIdentityProviderArn": {
+                            "type": "string"
+                        },
+                        "IdentityCenterInstanceArn": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "PersonalizationConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.PersonalizationConfiguration"
+                        },
+                        "QAppsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.QAppsConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AttachmentsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachmentsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AutoSubscriptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoSubscribe": {
+                    "type": "string"
+                },
+                "DefaultSubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoSubscribe"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.PersonalizationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PersonalizationControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PersonalizationControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.QAppsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QAppsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QAppsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentEnrichmentConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SyncSchedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DataSourceVpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "IndexId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeValueOperator": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DateValue": {
+                    "type": "string"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringListValue": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InlineConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration"
+                    },
+                    "type": "array"
+                },
+                "PostExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                },
+                "PreExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.HookConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InvocationCondition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "DocumentContentOperator": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CapacityConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Index.IndexCapacityConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentAttributeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QBusiness::Index.DocumentAttributeConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.DocumentAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Search": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexCapacityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "TextDocumentStatistics": {
+                    "$ref": "#/definitions/AWS::QBusiness::Index.TextDocumentStatistics"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.TextDocumentStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexedTextBytes": {
+                    "type": "number"
+                },
+                "IndexedTextDocumentCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "AuthConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.PluginAuthConfiguration"
+                        },
+                        "CustomPluginConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.CustomPluginConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ServerUrl": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "AuthConfiguration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Plugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.APISchema": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.BasicAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.CustomPluginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSchema": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.APISchema"
+                },
+                "ApiSchemaType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSchema",
+                "ApiSchemaType",
+                "Description"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.PluginAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.BasicAuthConfiguration"
+                },
+                "NoAuthConfiguration": {
+                    "type": "object"
+                },
+                "OAuth2ClientCredentialConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever.RetrieverConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Retriever"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.KendraIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.NativeIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.RetrieverConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KendraIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.KendraIndexConfiguration"
+                },
+                "NativeIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.NativeIndexConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "IdentityProviderConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience.IdentityProviderConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SamplePromptsControlMode": {
+                            "type": "string"
+                        },
+                        "Subtitle": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Title": {
+                            "type": "string"
+                        },
+                        "WelcomeMessage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::WebExperience"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.IdentityProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OpenIDConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration"
+                },
+                "SamlConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.SamlProviderConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsArn": {
+                    "type": "string"
+                },
+                "SecretsRole": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretsArn",
+                "SecretsRole"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.SamlProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthenticationUrl"
+            ],
+            "type": "object"
+        },
         "AWS::QLDB::Ledger": {
             "additionalProperties": false,
             "properties": {
@@ -148489,6 +157845,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.SheetDefinition"
@@ -149283,6 +158642,25 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -149436,6 +158814,9 @@ var CloudformationSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149520,6 +158901,9 @@ var CloudformationSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ComboChartSortConfiguration"
                 },
@@ -150537,6 +159921,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -150592,6 +159979,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -150682,6 +160072,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 }
@@ -151013,6 +160406,9 @@ var CloudformationSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -151169,6 +160565,9 @@ var CloudformationSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.NumericEqualityFilter"
                 },
@@ -151242,6 +160641,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -151271,6 +160673,9 @@ var CloudformationSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -151416,6 +160821,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Analysis.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 },
@@ -152621,6 +162029,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153134,6 +162551,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.SmallMultiplesOptions"
                 },
@@ -153496,6 +162916,30 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153882,6 +163326,9 @@ var CloudformationSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -154728,6 +164175,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -155758,6 +165214,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157132,6 +166597,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -157141,6 +166615,9 @@ var CloudformationSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DataLabelOptions"
                 },
@@ -157177,6 +166654,21 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157387,6 +166879,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard": {
             "additionalProperties": false,
             "properties": {
@@ -158296,6 +167800,25 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -158449,6 +167972,9 @@ var CloudformationSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -158533,6 +168059,9 @@ var CloudformationSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ComboChartSortConfiguration"
                 },
@@ -159767,6 +169296,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -159822,6 +169354,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -159912,6 +169447,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 }
@@ -160270,6 +169808,9 @@ var CloudformationSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -160426,6 +169967,9 @@ var CloudformationSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.NumericEqualityFilter"
                 },
@@ -160499,6 +170043,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -160528,6 +170075,9 @@ var CloudformationSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -160673,6 +170223,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Dashboard.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 },
@@ -161878,6 +171431,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -162391,6 +171953,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.SmallMultiplesOptions"
                 },
@@ -162765,6 +172330,30 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -163151,6 +172740,9 @@ var CloudformationSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -165045,6 +174637,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166437,6 +176038,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -166446,6 +176056,9 @@ var CloudformationSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataLabelOptions"
                 },
@@ -166482,6 +176095,21 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166692,6 +176320,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSet": {
             "additionalProperties": false,
             "properties": {
@@ -166766,6 +176406,12 @@ var CloudformationSchema = `{
                             },
                             "type": "object"
                         },
+                        "FolderArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "ImportMode": {
                             "type": "string"
                         },
@@ -167134,6 +176780,9 @@ var CloudformationSchema = `{
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.LookbackWindow"
                 }
             },
+            "required": [
+                "LookbackWindow"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
@@ -167258,8 +176907,7 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Alias",
-                "Source"
+                "Alias"
             ],
             "type": "object"
         },
@@ -167291,6 +176939,11 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Size",
+                "SizeUnit"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.NewDefaultValues": {
@@ -167396,6 +177049,9 @@ var CloudformationSchema = `{
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.IncrementalRefresh"
                 }
             },
+            "required": [
+                "IncrementalRefresh"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.RelationalTable": {
@@ -167629,8 +177285,30 @@ var CloudformationSchema = `{
                 },
                 "TagColumnOperation": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                },
+                "UntagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UntagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UntagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "TagNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "TagNames"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.UploadSettings": {
@@ -167735,6 +177413,10 @@ var CloudformationSchema = `{
                             "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -167753,7 +177435,8 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -167968,6 +177651,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.IdentityCenterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableIdentityPropagation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -168100,6 +177792,30 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.RedshiftIAMParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoCreateDatabaseUser": {
+                    "type": "boolean"
+                },
+                "DatabaseGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DatabaseUser": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.RedshiftParameters": {
             "additionalProperties": false,
             "properties": {
@@ -168112,6 +177828,12 @@ var CloudformationSchema = `{
                 "Host": {
                     "type": "string"
                 },
+                "IAMParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftIAMParameters"
+                },
+                "IdentityCenterConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.IdentityCenterConfiguration"
+                },
                 "Port": {
                     "type": "number"
                 }
@@ -168132,6 +177854,9 @@ var CloudformationSchema = `{
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -168295,6 +178020,113 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Folder": {
+            "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": {
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "FolderId": {
+                            "type": "string"
+                        },
+                        "FolderType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentFolderArn": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Folder.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SharingModel": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Folder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Folder.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::RefreshSchedule": {
             "additionalProperties": false,
             "properties": {
@@ -169291,6 +179123,25 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -169483,6 +179334,9 @@ var CloudformationSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -169567,6 +179421,9 @@ var CloudformationSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ComboChartSortConfiguration"
                 },
@@ -170560,6 +180417,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -170615,6 +180475,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -170705,6 +180568,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 }
@@ -171036,6 +180902,9 @@ var CloudformationSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -171192,6 +181061,9 @@ var CloudformationSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.NumericEqualityFilter"
                 },
@@ -171265,6 +181137,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -171294,6 +181169,9 @@ var CloudformationSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -171439,6 +181317,9 @@ var CloudformationSchema = `{
         "AWS::QuickSight::Template.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 },
@@ -172644,6 +182525,15 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173138,6 +183028,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.SmallMultiplesOptions"
                 },
@@ -173500,6 +183393,30 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173886,6 +183803,9 @@ var CloudformationSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -174702,6 +184622,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -175732,6 +185661,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -176467,6 +186405,9 @@ var CloudformationSchema = `{
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.SheetDefinition"
@@ -177241,6 +187182,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -177250,6 +187200,9 @@ var CloudformationSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DataLabelOptions"
                 },
@@ -177286,6 +187239,21 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -177496,6 +187464,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Theme": {
             "additionalProperties": false,
             "properties": {
@@ -178227,6 +188207,9 @@ var CloudformationSchema = `{
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "Expression": {
                     "type": "string"
                 },
@@ -178333,6 +188316,9 @@ var CloudformationSchema = `{
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "IsIncludedInTopic": {
                     "type": "boolean"
                 },
@@ -179018,9 +189004,15 @@ var CloudformationSchema = `{
                         "EnableIAMDatabaseAuthentication": {
                             "type": "boolean"
                         },
+                        "EnableLocalWriteForwarding": {
+                            "type": "boolean"
+                        },
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineMode": {
                             "type": "string"
                         },
@@ -179470,6 +189462,9 @@ var CloudformationSchema = `{
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180506,6 +190501,9 @@ var CloudformationSchema = `{
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180517,6 +190515,12 @@ var CloudformationSchema = `{
                         },
                         "StorageEncrypted": {
                             "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "type": "object"
@@ -181225,6 +191229,15 @@ var CloudformationSchema = `{
                 "BucketName": {
                     "type": "string"
                 },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogExports": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "S3KeyPrefix": {
                     "type": "string"
                 }
@@ -184646,6 +194659,15 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AcceptRoleSessionName": {
+                            "type": "boolean"
+                        },
+                        "AttributeMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RolesAnywhere::Profile.AttributeMapping"
+                            },
+                            "type": "array"
+                        },
                         "DurationSeconds": {
                             "type": "number"
                         },
@@ -184707,6 +194729,37 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::RolesAnywhere::Profile.AttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateField": {
+                    "type": "string"
+                },
+                "MappingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RolesAnywhere::Profile.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateField",
+                "MappingRules"
+            ],
+            "type": "object"
+        },
+        "AWS::RolesAnywhere::Profile.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Specifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Specifier"
+            ],
+            "type": "object"
+        },
         "AWS::RolesAnywhere::TrustAnchor": {
             "additionalProperties": false,
             "properties": {
@@ -186938,6 +196991,9 @@ var CloudformationSchema = `{
                 "FirewallDomainListId": {
                     "type": "string"
                 },
+                "FirewallDomainRedirectionAction": {
+                    "type": "string"
+                },
                 "Priority": {
                     "type": "number"
                 },
@@ -187533,6 +197589,9 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DelegationRecord": {
+                            "type": "string"
+                        },
                         "DomainName": {
                             "type": "string"
                         },
@@ -187559,7 +197618,6 @@ var CloudformationSchema = `{
                         }
                     },
                     "required": [
-                        "DomainName",
                         "RuleType"
                     ],
                     "type": "object"
@@ -188497,6 +198555,9 @@ var CloudformationSchema = `{
                         "$ref": "#/definitions/AWS::S3::Bucket.Rule"
                     },
                     "type": "array"
+                },
+                "TransitionDefaultMinimumObjectSize": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -190113,6 +200174,9 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.BucketEncryption"
+                        },
                         "BucketName": {
                             "type": "string"
                         },
@@ -190145,11 +200209,53 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
             ],
             "type": "object"
         },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
         "AWS::S3ObjectLambda::AccessPoint": {
             "additionalProperties": false,
             "properties": {
@@ -191163,6 +201269,18 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventBusArn"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
             "additionalProperties": false,
             "properties": {
@@ -191172,6 +201290,9 @@ var CloudformationSchema = `{
                 "Enabled": {
                     "type": "boolean"
                 },
+                "EventBridgeDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination"
+                },
                 "KinesisFirehoseDestination": {
                     "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
                 },
@@ -191518,6 +201639,1175 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::SES::MailManagerAddonInstance": {
+            "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": {
+                        "AddonSubscriptionId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonSubscriptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerAddonSubscription": {
+            "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": {
+                        "AddonName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive": {
+            "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": {
+                        "ArchiveName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Retention": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive.ArchiveRetention"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerArchive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive.ArchiveRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "RetentionPeriod": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RetentionPeriod"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint": {
+            "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": {
+                        "IngressPointConfiguration": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint.IngressPointConfiguration"
+                        },
+                        "IngressPointName": {
+                            "type": "string"
+                        },
+                        "RuleSetId": {
+                            "type": "string"
+                        },
+                        "StatusToUpdate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RuleSetId",
+                        "TrafficPolicyId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerIngressPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint.IngressPointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SmtpPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay": {
+            "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": {
+                        "Authentication": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay.RelayAuthentication"
+                        },
+                        "RelayName": {
+                            "type": "string"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "ServerName",
+                        "ServerPort"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRelay"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay.RelayAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "NoAuthentication": {
+                    "type": "object"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet": {
+            "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": {
+                        "RuleSetName": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ArchiveAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "TargetArchive": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArchive"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.DeliverToMailboxAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailboxArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MailboxArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RelayAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailFrom": {
+                    "type": "string"
+                },
+                "Relay": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Relay"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ReplaceRecipientAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplaceWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleAction"
+                    },
+                    "type": "array"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Unless": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeader": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.AddHeaderAction"
+                },
+                "Archive": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ArchiveAction"
+                },
+                "DeliverToMailbox": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.DeliverToMailboxAction"
+                },
+                "Drop": {
+                    "type": "object"
+                },
+                "Relay": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RelayAction"
+                },
+                "ReplaceRecipient": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ReplaceRecipientAction"
+                },
+                "Send": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.SendAction"
+                },
+                "WriteToS3": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.S3Action"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanExpression"
+                },
+                "DmarcExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleDmarcExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpExpression"
+                },
+                "NumberExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberExpression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringExpression"
+                },
+                "VerdictExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleDmarcExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MimeHeaderAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Analysis"
+                },
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                },
+                "S3SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.SendAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy": {
+            "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": {
+                        "DefaultAction": {
+                            "type": "string"
+                        },
+                        "MaxMessageSizeBytes": {
+                            "type": "number"
+                        },
+                        "PolicyStatements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyStatement"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "PolicyStatements"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerTrafficPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressAnalysis"
+                }
+            },
+            "required": [
+                "Analysis"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringExpression"
+                },
+                "TlsExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Conditions"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ReceiptFilter": {
             "additionalProperties": false,
             "properties": {
@@ -191809,6 +203099,9 @@ var CloudformationSchema = `{
                 "BucketName": {
                     "type": "string"
                 },
+                "IamRoleArn": {
+                    "type": "string"
+                },
                 "KmsKeyArn": {
                     "type": "string"
                 },
@@ -194960,6 +206253,342 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SSMQuickSetup::ConfigurationManager": {
+            "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": {
+                        "ConfigurationDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationDefinitions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMQuickSetup::ConfigurationManager"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeploymentAdministrationRoleArn": {
+                    "type": "string"
+                },
+                "LocalDeploymentExecutionRoleName": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "TypeVersion": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.StatusSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "LastUpdatedAt": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StatusDetails": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusMessage": {
+                    "type": "string"
+                },
+                "StatusType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LastUpdatedAt",
+                "StatusType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application": {
+            "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": {
+                        "ApplicationProviderArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PortalOptions": {
+                            "$ref": "#/definitions/AWS::SSO::Application.PortalOptionsConfiguration"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationProviderArn",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application.PortalOptionsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SignInOptions": {
+                    "$ref": "#/definitions/AWS::SSO::Application.SignInOptions"
+                },
+                "Visibility": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSO::Application.SignInOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationUrl": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Origin"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::ApplicationAssignment": {
+            "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"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "PrincipalId",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::ApplicationAssignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::Assignment": {
             "additionalProperties": false,
             "properties": {
@@ -195045,6 +206674,73 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SSO::Instance": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -195182,55 +206878,168 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CustomerManagedPolicyReferences": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InlinePolicy": {
-                            "type": "object"
-                        },
-                        "InstanceArn": {
+                        "CustomerManagedPolicyReferences": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
+                        },
+                        "RelayStateType": {
+                            "type": "string"
+                        },
+                        "SessionDuration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::PermissionSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.PermissionsBoundary": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedPolicyReference": {
+                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                },
+                "ManagedPolicyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::App": {
+            "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": {
+                        "AppName": {
                             "type": "string"
                         },
-                        "ManagedPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
+                        "AppType": {
                             "type": "string"
                         },
-                        "PermissionsBoundary": {
-                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
-                        },
-                        "RelayStateType": {
+                        "DomainId": {
                             "type": "string"
                         },
-                        "SessionDuration": {
-                            "type": "string"
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "InstanceArn",
-                        "Name"
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SSO::PermissionSet"
+                        "AWS::SageMaker::App"
                     ],
                     "type": "string"
                 },
@@ -195249,34 +207058,25 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+        "AWS::SageMaker::App.ResourceSpec": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "InstanceType": {
                     "type": "string"
                 },
-                "Path": {
+                "LifecycleConfigArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::SSO::PermissionSet.PermissionsBoundary": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomerManagedPolicyReference": {
-                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
                 },
-                "ManagedPolicyArn": {
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::App": {
+        "AWS::SageMaker::AppImageConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195311,39 +207111,33 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppName": {
+                        "AppImageConfigName": {
                             "type": "string"
                         },
-                        "AppType": {
-                            "type": "string"
+                        "CodeEditorAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
                         },
-                        "DomainId": {
-                            "type": "string"
+                        "JupyterLabAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
                         },
-                        "ResourceSpec": {
-                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserProfileName": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "AppName",
-                        "AppType",
-                        "DomainId",
-                        "UserProfileName"
+                        "AppImageConfigName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::App"
+                        "AWS::SageMaker::AppImageConfig"
                     ],
                     "type": "string"
                 },
@@ -195362,22 +207156,113 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::App.ResourceSpec": {
+        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceType": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "SageMakerImageArn": {
+                "Value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
                 },
-                "SageMakerImageVersionArn": {
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig": {
+        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
+                },
+                "KernelSpecs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "KernelSpecs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "DisplayName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Cluster": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195412,33 +207297,39 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppImageConfigName": {
+                        "ClusterName": {
                             "type": "string"
                         },
-                        "CodeEditorAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
+                        "InstanceGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceGroup"
+                            },
+                            "type": "array"
                         },
-                        "JupyterLabAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
+                        "NodeRecovery": {
+                            "type": "string"
                         },
-                        "KernelGatewayImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        "Orchestrator": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.Orchestrator"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppImageConfigName"
+                        "InstanceGroups"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::AppImageConfig"
+                        "AWS::SageMaker::Cluster"
                     ],
                     "type": "string"
                 },
@@ -195457,109 +207348,129 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterEbsVolumeConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "VolumeSizeInGB": {
+                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+        "AWS::SageMaker::Cluster.ClusterInstanceGroup": {
             "additionalProperties": false,
             "properties": {
-                "ContainerArguments": {
+                "CurrentCount": {
+                    "type": "number"
+                },
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceGroupName": {
+                    "type": "string"
+                },
+                "InstanceStorageConfigs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceStorageConfig"
                     },
                     "type": "array"
                 },
-                "ContainerEntrypoint": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LifeCycleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterLifeCycleConfig"
+                },
+                "OnStartDeepHealthChecks": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "ContainerEnvironmentVariables": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
-                    },
-                    "type": "array"
+                "ThreadsPerCore": {
+                    "type": "number"
                 }
             },
+            "required": [
+                "ExecutionRole",
+                "InstanceCount",
+                "InstanceGroupName",
+                "InstanceType",
+                "LifeCycleConfig"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+        "AWS::SageMaker::Cluster.ClusterInstanceStorageConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "EbsVolumeConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterEbsVolumeConfig"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+        "AWS::SageMaker::Cluster.ClusterLifeCycleConfig": {
             "additionalProperties": false,
             "properties": {
-                "DefaultGid": {
-                    "type": "number"
-                },
-                "DefaultUid": {
-                    "type": "number"
+                "OnCreate": {
+                    "type": "string"
                 },
-                "MountPath": {
+                "SourceS3Uri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "OnCreate",
+                "SourceS3Uri"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "ClusterArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ClusterArn"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+        "AWS::SageMaker::Cluster.Orchestrator": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
-                },
-                "KernelSpecs": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
-                    },
-                    "type": "array"
+                "Eks": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig"
                 }
             },
             "required": [
-                "KernelSpecs"
+                "Eks"
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+        "AWS::SageMaker::Cluster.VpcConfig": {
             "additionalProperties": false,
             "properties": {
-                "DisplayName": {
-                    "type": "string"
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Name": {
-                    "type": "string"
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name"
+                "SecurityGroupIds",
+                "Subnets"
             ],
             "type": "object"
         },
@@ -196355,9 +208266,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
@@ -196451,9 +208374,21 @@ var CloudformationSchema = `{
         "AWS::SageMaker::Domain.DefaultSpaceSettings": {
             "additionalProperties": false,
             "properties": {
+                "CustomFileSystemConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomFileSystemConfig"
+                    },
+                    "type": "array"
+                },
+                "CustomPosixUserConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.CustomPosixUserConfig"
+                },
                 "ExecutionRole": {
                     "type": "string"
                 },
+                "JupyterLabAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterLabAppSettings"
+                },
                 "JupyterServerAppSettings": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
                 },
@@ -196465,6 +208400,9 @@ var CloudformationSchema = `{
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "SpaceStorageSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.DefaultSpaceStorageSettings"
                 }
             },
             "required": [
@@ -196529,9 +208467,30 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CodeRepository"
@@ -196561,6 +208520,12 @@ var CloudformationSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196576,6 +208541,12 @@ var CloudformationSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196661,6 +208632,24 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Domain.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -196711,6 +208700,9 @@ var CloudformationSchema = `{
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.StudioWebPortalSettings"
                 }
             },
             "required": [
@@ -197795,6 +209787,9 @@ var CloudformationSchema = `{
                         },
                         "VendorGuidance": {
                             "type": "string"
+                        },
+                        "Version": {
+                            "type": "number"
                         }
                     },
                     "required": [
@@ -198282,6 +210277,97 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::MlflowTrackingServer": {
+            "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": {
+                        "ArtifactStoreUri": {
+                            "type": "string"
+                        },
+                        "AutomaticModelRegistration": {
+                            "type": "boolean"
+                        },
+                        "MlflowVersion": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingServerName": {
+                            "type": "string"
+                        },
+                        "TrackingServerSize": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ArtifactStoreUri",
+                        "RoleArn",
+                        "TrackingServerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MlflowTrackingServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model": {
             "additionalProperties": false,
             "properties": {
@@ -198370,6 +210456,22 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Model.AdditionalModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.S3DataSource"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "S3DataSource"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ContainerDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -198406,6 +210508,18 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Model.HubAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HubContentArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HubContentArn"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ImageConfig": {
             "additionalProperties": false,
             "properties": {
@@ -198484,6 +210598,9 @@ var CloudformationSchema = `{
                 "CompressionType": {
                     "type": "string"
                 },
+                "HubAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.HubAccessConfig"
+                },
                 "ModelAccessConfig": {
                     "$ref": "#/definitions/AWS::SageMaker::Model.ModelAccessConfig"
                 },
@@ -200005,6 +212122,9 @@ var CloudformationSchema = `{
                         "ModelApprovalStatus": {
                             "type": "string"
                         },
+                        "ModelCard": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelCard"
+                        },
                         "ModelMetrics": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelMetrics"
                         },
@@ -200026,12 +212146,18 @@ var CloudformationSchema = `{
                         "SamplePayloadUrl": {
                             "type": "string"
                         },
+                        "SecurityConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SecurityConfig"
+                        },
                         "SkipModelValidation": {
                             "type": "string"
                         },
                         "SourceAlgorithmSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SourceAlgorithmSpecification"
                         },
+                        "SourceUri": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -200314,6 +212440,34 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceptEula": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AcceptEula"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.ModelCard": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCardContent": {
+                    "type": "string"
+                },
+                "ModelCardStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ModelCardContent",
+                "ModelCardStatus"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelDataQuality": {
             "additionalProperties": false,
             "properties": {
@@ -200326,6 +212480,15 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.S3ModelDataSource"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelInput": {
             "additionalProperties": false,
             "properties": {
@@ -200383,6 +212546,9 @@ var CloudformationSchema = `{
                 "ImageDigest": {
                     "type": "string"
                 },
+                "ModelDataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelDataSource"
+                },
                 "ModelDataUrl": {
                     "type": "string"
                 },
@@ -200457,6 +212623,41 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.S3ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionType": {
+                    "type": "string"
+                },
+                "ModelAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelAccessConfig"
+                },
+                "S3DataType": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionType",
+                "S3DataType",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.SecurityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKeyId"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.SourceAlgorithm": {
             "additionalProperties": false,
             "properties": {
@@ -202279,6 +214480,12 @@ var CloudformationSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202294,6 +214501,12 @@ var CloudformationSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202316,6 +214529,9 @@ var CloudformationSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202325,18 +214541,42 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceAppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceIdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceCodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
                 }
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceIdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceJupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Space.CodeRepository"
@@ -202400,6 +214640,85 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::StudioLifecycleConfig": {
+            "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": {
+                        "StudioLifecycleConfigAppType": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigContent": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StudioLifecycleConfigAppType",
+                        "StudioLifecycleConfigContent",
+                        "StudioLifecycleConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::StudioLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile": {
             "additionalProperties": false,
             "properties": {
@@ -202484,9 +214803,21 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
@@ -202601,9 +214932,30 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CodeRepository"
@@ -202633,6 +214985,12 @@ var CloudformationSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202648,6 +215006,12 @@ var CloudformationSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202670,6 +215034,9 @@ var CloudformationSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202694,6 +215061,24 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -202741,6 +215126,9 @@ var CloudformationSchema = `{
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.StudioWebPortalSettings"
                 }
             },
             "type": "object"
@@ -203810,6 +216198,13 @@ var CloudformationSchema = `{
                             "type": "object"
                         }
                     },
+                    "required": [
+                        "Actions",
+                        "Criteria",
+                        "Description",
+                        "RuleName",
+                        "RuleOrder"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -203828,7 +216223,8 @@ var CloudformationSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -204250,6 +216646,210 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::ConfigurationPolicy": {
+            "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": {
+                        "ConfigurationPolicy": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.Policy"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicy",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ConfigurationPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityHub": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecurityControlId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EnabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlCustomParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledStandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlsConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration"
+                },
+                "ServiceEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::DelegatedAdmin": {
             "additionalProperties": false,
             "properties": {
@@ -204315,6 +216915,77 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::FindingAggregator": {
+            "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": {
+                        "RegionLinkingMode": {
+                            "type": "string"
+                        },
+                        "Regions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegionLinkingMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::FindingAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
@@ -205176,6 +217847,150 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::OrganizationConfiguration": {
+            "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": {
+                        "AutoEnable": {
+                            "type": "boolean"
+                        },
+                        "AutoEnableStandards": {
+                            "type": "string"
+                        },
+                        "ConfigurationType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoEnable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::OrganizationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::PolicyAssociation": {
+            "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": {
+                        "ConfigurationPolicyId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicyId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::PolicyAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::ProductSubscription": {
             "additionalProperties": false,
             "properties": {
@@ -205211,18 +218026,98 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ProductArn": {
+                        "ProductArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ProductSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl": {
+            "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": {
+                        "LastUpdateReason": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityControlArn": {
+                            "type": "string"
+                        },
+                        "SecurityControlId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ProductArn"
+                        "Parameters"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
+                        "AWS::SecurityHub::SecurityControl"
                     ],
                     "type": "string"
                 },
@@ -205241,6 +218136,60 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::SecurityControl.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
@@ -205690,6 +218639,112 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityLake::SubscriberNotification": {
+            "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": {
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.NotificationConfiguration"
+                        },
+                        "SubscriberArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationConfiguration",
+                        "SubscriberArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityLake::SubscriberNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationApiKeyName": {
+                    "type": "string"
+                },
+                "AuthorizationApiKeyValue": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "TargetRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "TargetRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpsNotificationConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration"
+                },
+                "SqsNotificationConfiguration": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
@@ -208596,6 +221651,9 @@ var CloudformationSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity.EncryptionConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -208632,6 +221690,24 @@ var CloudformationSchema = `{
             ],
             "type": "object"
         },
+        "AWS::StepFunctions::Activity.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::Activity.TagsEntry": {
             "additionalProperties": false,
             "properties": {
@@ -208701,6 +221777,9 @@ var CloudformationSchema = `{
                             },
                             "type": "object"
                         },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.EncryptionConfiguration"
+                        },
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
                         },
@@ -208758,6 +221837,24 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::StepFunctions::StateMachine.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::StateMachine.LogDestination": {
             "additionalProperties": false,
             "properties": {
@@ -209292,6 +222389,12 @@ var CloudformationSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "ResourcesToReplicateTags": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "RunConfig": {
                             "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
                         },
@@ -209623,6 +222726,9 @@ var CloudformationSchema = `{
                             },
                             "type": "array"
                         },
+                        "DatabaseArn": {
+                            "type": "string"
+                        },
                         "Instances": {
                             "items": {
                                 "type": "string"
@@ -210588,6 +223694,9 @@ var CloudformationSchema = `{
                         "LoggingRole": {
                             "type": "string"
                         },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
                         "SftpConfig": {
                             "$ref": "#/definitions/AWS::Transfer::Connector.SftpConfig"
                         },
@@ -211289,6 +224398,10 @@ var CloudformationSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "DestinationFileLocation",
+                "Type"
+            ],
             "type": "object"
         },
         "AWS::Transfer::Workflow.DeleteStepDetails": {
@@ -211516,13 +224629,93 @@ var CloudformationSchema = `{
             "properties": {
                 "CognitoUserPoolConfiguration": {
                     "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                },
+                "OpenIdConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audiences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdPrefix": {
+                    "type": "string"
+                },
+                "GroupConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "TokenSelection": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection"
                 }
             },
             "required": [
-                "CognitoUserPoolConfiguration"
+                "Issuer",
+                "TokenSelection"
             ],
             "type": "object"
         },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupClaim": {
+                    "type": "string"
+                },
+                "GroupEntityType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupClaim",
+                "GroupEntityType"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration"
+                },
+                "IdentityTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::VerifiedPermissions::Policy": {
             "additionalProperties": false,
             "properties": {
@@ -218216,6 +231409,140 @@ var CloudformationSchema = `{
             },
             "type": "object"
         },
+        "AWS::WorkSpaces::WorkspacesPool": {
+            "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": {
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.ApplicationSettings"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Capacity": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.Capacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.TimeoutSettings"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "Capacity",
+                        "DirectoryId",
+                        "PoolName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::WorkspacesPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SettingsGroup": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.Capacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredUserSessions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredUserSessions"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.TimeoutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "IdleDisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "MaxUserDurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WorkSpacesThinClient::Environment": {
             "additionalProperties": false,
             "properties": {
@@ -218260,6 +231587,12 @@ var CloudformationSchema = `{
                         "DesktopEndpoint": {
                             "type": "string"
                         },
+                        "DeviceCreationTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "KmsKeyArn": {
                             "type": "string"
                         },
@@ -218472,6 +231805,12 @@ var CloudformationSchema = `{
                         },
                         "PortalArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -218998,6 +232337,9 @@ var CloudformationSchema = `{
                         "CustomerManagedKey": {
                             "type": "string"
                         },
+                        "DeepLinkAllowed": {
+                            "type": "string"
+                        },
                         "DisconnectTimeoutInMinutes": {
                             "type": "number"
                         },
@@ -219725,6 +233067,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::APS::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ARCZonalShift::ZonalAutoshiftConfiguration"
                         },
@@ -220001,6 +233346,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppSync::SourceApiAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppTest::TestCase"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
                         },
@@ -220010,6 +233358,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::ApplicationInsights::Application"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Athena::CapacityReservation"
                         },
@@ -220109,12 +233460,30 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Bedrock::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::Guardrail"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::GuardrailVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Prompt"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::PromptVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::BillingConductor::BillingGroup"
                         },
@@ -220175,6 +233544,12 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::Membership"
                         },
@@ -220451,6 +233826,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Config::StoredQuery"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::AgentStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::ApprovedOrigin"
                         },
@@ -220514,6 +233892,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::View"
                         },
@@ -220661,18 +234042,30 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::DataZone::Environment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentBlueprintConfiguration"
                         },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentProfile"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::GroupProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::Project"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::SubscriptionTarget"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::UserProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Farm"
                         },
@@ -220685,6 +234078,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Deadline::MeteredProduct"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Deadline::Monitor"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Queue"
                         },
@@ -221414,6 +234810,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Glue::Trigger"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Glue::Workflow"
                         },
@@ -221492,6 +234891,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::IPSet"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan"
+                        },
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::Master"
                         },
@@ -221567,6 +234969,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::IVS::PlaybackRestrictionPolicy"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PublicKey"
+                        },
                         {
                             "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
                         },
@@ -221876,6 +235281,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::KendraRanking::ExecutionPlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::ResourcePolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kinesis::Stream"
                         },
@@ -221963,6 +235371,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Lambda::Version"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::LaunchWizard::Deployment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Lex::Bot"
                         },
@@ -222173,6 +235584,24 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Channel"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Input"
                         },
@@ -222185,6 +235614,15 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Network"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SdiSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SignalMap"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaPackage::Asset"
                         },
@@ -222266,6 +235704,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::EventSubscription"
+                        },
                         {
                             "$ref": "#/definitions/AWS::NeptuneGraph::Graph"
                         },
@@ -222443,6 +235884,12 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::PCAConnectorAD::TemplateGroupAccessControlEntry"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Challenge"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
                         },
@@ -222551,6 +235998,24 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Proton::ServiceTemplate"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QLDB::Ledger"
                         },
@@ -222569,6 +236034,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::QuickSight::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Folder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QuickSight::RefreshSchedule"
                         },
@@ -222896,6 +236364,27 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SES::EmailIdentity"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SES::ReceiptFilter"
                         },
@@ -222977,9 +236466,21 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::ApplicationAssignment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::Assignment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Instance"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
                         },
@@ -222992,6 +236493,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
                         },
@@ -223028,6 +236532,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::InferenceExperiment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MlflowTrackingServer"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Model"
                         },
@@ -223067,6 +236574,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Space"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::StudioLifecycleConfig"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::UserProfile"
                         },
@@ -223094,18 +236604,33 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::FindingAggregator"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Insight"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::OrganizationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::PolicyAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::SecurityControl"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
@@ -223118,6 +236643,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityLake::Subscriber"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
                         },
@@ -223409,6 +236937,9 @@ var CloudformationSchema = `{
                         {
                             "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool"
+                        },
                         {
                             "$ref": "#/definitions/AWS::WorkSpacesThinClient::Environment"
                         },
diff --git a/schema/cloudformation.schema.json b/schema/cloudformation.schema.json
index cc354302ee..78d68d0b3e 100644
--- a/schema/cloudformation.schema.json
+++ b/schema/cloudformation.schema.json
@@ -536,6 +536,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.CrlDistributionPointExtensionConfiguration": {
@@ -592,7 +595,6 @@
                 }
             },
             "required": [
-                "NameAssigner",
                 "PartyName"
             ],
             "type": "object"
@@ -670,6 +672,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.OtherName": {
@@ -1227,6 +1232,71 @@
             },
             "type": "object"
         },
+        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus": {
+            "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": {
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::ARCZonalShift::ZonalAutoshiftConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -1609,11 +1679,9 @@
                         }
                     },
                     "required": [
-                        "AutoMinorVersionUpgrade",
                         "BrokerName",
                         "DeploymentMode",
                         "EngineType",
-                        "EngineVersion",
                         "HostInstanceType",
                         "PubliclyAccessible",
                         "Users"
@@ -1862,7 +1930,6 @@
                     "required": [
                         "Data",
                         "EngineType",
-                        "EngineVersion",
                         "Name"
                     ],
                     "type": "object"
@@ -2036,6 +2103,9 @@
                         "BuildSpec": {
                             "type": "string"
                         },
+                        "CacheConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.CacheConfig"
+                        },
                         "CustomHeaders": {
                             "type": "string"
                         },
@@ -2165,6 +2235,15 @@
             },
             "type": "object"
         },
+        "AWS::Amplify::App.CacheConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Amplify::App.CustomRule": {
             "additionalProperties": false,
             "properties": {
@@ -6484,12 +6563,30 @@
                             "type": "string"
                         },
                         "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "RequestTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "ResponseParameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameterMap"
+                                }
+                            },
                             "type": "object"
                         },
                         "TemplateSelectionExpression": {
@@ -6539,13 +6636,9 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "Destination",
-                "Source"
-            ],
             "type": "object"
         },
-        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+        "AWS::ApiGatewayV2::Integration.ResponseParameterMap": {
             "additionalProperties": false,
             "properties": {
                 "ResponseParameters": {
@@ -10100,7 +10193,8 @@
                     "required": [
                         "ApplicationSourceConfig",
                         "Description",
-                        "Name"
+                        "Name",
+                        "Namespace"
                     ],
                     "type": "object"
                 },
@@ -16541,7 +16635,7 @@
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget": {
+        "AWS::AppTest::TestCase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -16576,46 +16670,37 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MaxCapacity": {
-                            "type": "number"
-                        },
-                        "MinCapacity": {
-                            "type": "number"
-                        },
-                        "ResourceId": {
-                            "type": "string"
-                        },
-                        "RoleARN": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ScalableDimension": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ScheduledActions": {
+                        "Steps": {
                             "items": {
-                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                                "$ref": "#/definitions/AWS::AppTest::TestCase.Step"
                             },
                             "type": "array"
                         },
-                        "ServiceNamespace": {
-                            "type": "string"
-                        },
-                        "SuspendedState": {
-                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MaxCapacity",
-                        "MinCapacity",
-                        "ResourceId",
-                        "ScalableDimension",
-                        "ServiceNamespace"
+                        "Name",
+                        "Steps"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                        "AWS::AppTest::TestCase"
                     ],
                     "type": "string"
                 },
@@ -16634,62 +16719,542 @@
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+        "AWS::AppTest::TestCase.Batch": {
             "additionalProperties": false,
             "properties": {
-                "MaxCapacity": {
-                    "type": "number"
+                "BatchJobName": {
+                    "type": "string"
                 },
-                "MinCapacity": {
-                    "type": "number"
+                "BatchJobParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "BatchJobName"
+            ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+        "AWS::AppTest::TestCase.CloudFormationAction": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
+                "ActionType": {
                     "type": "string"
                 },
-                "ScalableTargetAction": {
-                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.CompareAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Input"
                 },
-                "Schedule": {
+                "Output": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Output"
+                }
+            },
+            "required": [
+                "Input"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ccsid": {
                     "type": "string"
                 },
-                "ScheduledActionName": {
+                "Format": {
                     "type": "string"
                 },
-                "StartTime": {
+                "Length": {
+                    "type": "number"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Timezone": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Schedule",
-                "ScheduledActionName"
+                "Ccsid",
+                "Format",
+                "Length",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+        "AWS::AppTest::TestCase.DatabaseCDC": {
             "additionalProperties": false,
             "properties": {
-                "DynamicScalingInSuspended": {
-                    "type": "boolean"
+                "SourceMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.SourceDatabaseMetadata"
                 },
-                "DynamicScalingOutSuspended": {
-                    "type": "boolean"
+                "TargetMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TargetDatabaseMetadata"
+                }
+            },
+            "required": [
+                "SourceMetadata",
+                "TargetMetadata"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.FileMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppTest::TestCase.DataSet"
+                    },
+                    "type": "array"
                 },
-                "ScheduledScalingSuspended": {
+                "DatabaseCDC": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.DatabaseCDC"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.InputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.InputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.FileMetadata"
+                },
+                "SourceLocation": {
+                    "type": "string"
+                },
+                "TargetLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileMetadata",
+                "SourceLocation",
+                "TargetLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2ManagedActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ForceStop": {
                     "type": "boolean"
+                },
+                "ImportDataSetLocation": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalingPolicy": {
+        "AWS::AppTest::TestCase.M2ManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2NonManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionType"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DmsTaskArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Batch": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Batch"
+                },
+                "Tn3270": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TN3270"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.OutputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.OutputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.ResourceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CloudFormationAction"
+                },
+                "M2ManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedApplicationAction"
+                },
+                "M2NonManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2NonManagedApplicationAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Script": {
+            "additionalProperties": false,
+            "properties": {
+                "ScriptLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScriptLocation",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.SourceDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Step": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.StepAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.StepAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CompareAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CompareAction"
+                },
+                "MainframeAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeAction"
+                },
+                "ResourceAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.ResourceAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TN3270": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Script": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Script"
+                }
+            },
+            "required": [
+                "Script"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TargetDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TestCaseLatestVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Status",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "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": {
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MinCapacity": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScheduledActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "SuspendedState": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        }
+                    },
+                    "required": [
+                        "MaxCapacity",
+                        "MinCapacity",
+                        "ResourceId",
+                        "ScalableDimension",
+                        "ServiceNamespace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "ScalableTargetAction": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                },
+                "Schedule": {
+                    "type": "string"
+                },
+                "ScheduledActionName": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule",
+                "ScheduledActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicScalingInSuspended": {
+                    "type": "boolean"
+                },
+                "DynamicScalingOutSuspended": {
+                    "type": "boolean"
+                },
+                "ScheduledScalingSuspended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17462,7 +18027,7 @@
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation": {
+        "AWS::ApplicationSignals::ServiceLevelObjective": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17497,31 +18062,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CapacityAssignmentConfiguration": {
-                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Goal": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Goal"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "RequestBasedSli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli"
+                        },
+                        "Sli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Sli"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TargetDpus": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "Name",
-                        "TargetDpus"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Athena::CapacityReservation"
+                        "AWS::ApplicationSignals::ServiceLevelObjective"
                     ],
                     "type": "string"
                 },
@@ -17540,37 +18110,378 @@
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval": {
             "additionalProperties": false,
             "properties": {
-                "WorkgroupNames": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Duration",
+                "DurationUnit",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Goal": {
+            "additionalProperties": false,
+            "properties": {
+                "AttainmentGoal": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Interval"
+                },
+                "WarningThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Interval": {
+            "additionalProperties": false,
+            "properties": {
+                "CalendarInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval"
+                },
+                "RollingInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Dimension"
                     },
                     "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "WorkgroupNames"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricStat": {
             "additionalProperties": false,
             "properties": {
-                "CapacityAssignments": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "BadCountMetric": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "GoodCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "RequestBasedSliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric"
+                }
+            },
+            "required": [
+                "RequestBasedSliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "MonitoredRequestCountMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "TotalRequestCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
                     },
                     "type": "array"
                 }
             },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                }
+            },
             "required": [
-                "CapacityAssignments"
+                "Duration",
+                "DurationUnit"
             ],
             "type": "object"
         },
-        "AWS::Athena::DataCatalog": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.Sli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "SliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.SliMetric"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricThreshold",
+                "SliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.SliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "PeriodSeconds": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation": {
+            "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": {
+                        "CapacityAssignmentConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetDpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetDpus"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkgroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WorkgroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityAssignments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CapacityAssignments"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -19179,6 +20090,12 @@
                 "MetricName": {
                     "type": "string"
                 },
+                "Metrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery"
+                    },
+                    "type": "array"
+                },
                 "Namespace": {
                     "type": "string"
                 },
@@ -19189,11 +20106,6 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "MetricName",
-                "Namespace",
-                "Statistic"
-            ],
             "type": "object"
         },
         "AWS::AutoScaling::ScalingPolicy.Metric": {
@@ -19478,179 +20390,222 @@
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::ScheduledAction": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Id": {
                     "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "DesiredCapacity": {
-                            "type": "number"
-                        },
-                        "EndTime": {
-                            "type": "string"
-                        },
-                        "MaxSize": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "Recurrence": {
-                            "type": "string"
-                        },
-                        "StartTime": {
-                            "type": "string"
-                        },
-                        "TimeZone": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::ScheduledAction"
-                    ],
+                "Label": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat": {
             "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "InstanceReusePolicy": {
-                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
-                        },
-                        "MaxGroupPreparedCapacity": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "PoolState": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
+                "Metric": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.Metric"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::WarmPool"
-                    ],
+                "Stat": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Metric",
+                "Stat"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "ReuseOnScaleIn": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::AutoScalingPlans::ScalingPlan": {
+        "AWS::AutoScaling::ScheduledAction": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "number"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Recurrence": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "InstanceReusePolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
+                        },
+                        "MaxGroupPreparedCapacity": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "PoolState": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::WarmPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ReuseOnScaleIn": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20048,6 +21003,9 @@
         "AWS::B2BI::Capability.EdiConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CapabilityDirection": {
+                    "type": "string"
+                },
                 "InputLocation": {
                     "$ref": "#/definitions/AWS::B2BI::Capability.S3Location"
                 },
@@ -20146,6 +21104,9 @@
                             },
                             "type": "array"
                         },
+                        "CapabilityOptions": {
+                            "$ref": "#/definitions/AWS::B2BI::Partnership.CapabilityOptions"
+                        },
                         "Email": {
                             "type": "string"
                         },
@@ -20166,6 +21127,7 @@
                         }
                     },
                     "required": [
+                        "Capabilities",
                         "Email",
                         "Name",
                         "ProfileId"
@@ -20193,93 +21155,112 @@
             ],
             "type": "object"
         },
-        "AWS::B2BI::Profile": {
+        "AWS::B2BI::Partnership.CapabilityOptions": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "OutboundEdi": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.OutboundEdiOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.OutboundEdiOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "X12": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Envelope"
+                }
+            },
+            "required": [
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Delimiters": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentSeparator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DataElementSeparator": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "SegmentTerminator": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Envelope": {
+            "additionalProperties": false,
+            "properties": {
+                "Common": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12OutboundEdiHeaders"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12FunctionalGroupHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationReceiverCode": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "ApplicationSenderCode": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "BusinessName": {
-                            "type": "string"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "Logging": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Phone": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "BusinessName",
-                        "Logging",
-                        "Name",
-                        "Phone"
-                    ],
-                    "type": "object"
+                "ResponsibleAgencyCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12InterchangeControlHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "AcknowledgmentRequestedCode": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::B2BI::Profile"
-                    ],
+                "ReceiverId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ReceiverIdQualifier": {
+                    "type": "string"
+                },
+                "RepetitionSeparator": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "SenderIdQualifier": {
+                    "type": "string"
+                },
+                "UsageIndicatorCode": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer": {
+        "AWS::B2BI::Partnership.X12OutboundEdiHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiters": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Delimiters"
+                },
+                "FunctionalGroupHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12FunctionalGroupHeaders"
+                },
+                "InterchangeControlHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12InterchangeControlHeaders"
+                },
+                "ValidateEdi": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Profile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20314,21 +21295,107 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EdiType": {
-                            "$ref": "#/definitions/AWS::B2BI::Transformer.EdiType"
+                        "BusinessName": {
+                            "type": "string"
                         },
-                        "FileFormat": {
+                        "Email": {
                             "type": "string"
                         },
-                        "MappingTemplate": {
+                        "Logging": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "SampleDocument": {
+                        "Phone": {
                             "type": "string"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BusinessName",
+                        "Logging",
+                        "Name",
+                        "Phone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::B2BI::Profile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer": {
+            "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": {
+                        "InputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.InputConversion"
+                        },
+                        "Mapping": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.Mapping"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.OutputConversion"
+                        },
+                        "SampleDocuments": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocuments"
+                        },
                         "Status": {
                             "type": "string"
                         },
@@ -20340,9 +21407,6 @@
                         }
                     },
                     "required": [
-                        "EdiType",
-                        "FileFormat",
-                        "MappingTemplate",
                         "Name",
                         "Status"
                     ],
@@ -20369,15 +21433,91 @@
             ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer.EdiType": {
+        "AWS::B2BI::Transformer.FormatOptions": {
             "additionalProperties": false,
             "properties": {
-                "X12Details": {
+                "X12": {
                     "$ref": "#/definitions/AWS::B2BI::Transformer.X12Details"
                 }
             },
             "required": [
-                "X12Details"
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.InputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "FromFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FromFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.Mapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Template": {
+                    "type": "string"
+                },
+                "TemplateLanguage": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateLanguage"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.OutputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "ToFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ToFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocumentKeys": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Output": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Keys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocumentKeys"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Keys"
             ],
             "type": "object"
         },
@@ -21408,6 +22548,9 @@
                         "ScheduleExpressionTimezone": {
                             "type": "string"
                         },
+                        "ScheduleStatus": {
+                            "type": "string"
+                        },
                         "StartWindowHours": {
                             "type": "number"
                         },
@@ -21736,6 +22879,9 @@
                         "ComputeResources": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
                         },
+                        "Context": {
+                            "type": "string"
+                        },
                         "EksConfiguration": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.EksConfiguration"
                         },
@@ -22613,6 +23759,9 @@
                 "EcsProperties": {
                     "$ref": "#/definitions/AWS::Batch::JobDefinition.EcsProperties"
                 },
+                "EksProperties": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EksProperties"
+                },
                 "InstanceTypes": {
                     "items": {
                         "type": "string"
@@ -23207,6 +24356,9 @@
                         "FoundationModel": {
                             "type": "string"
                         },
+                        "GuardrailConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.GuardrailConfiguration"
+                        },
                         "IdleSessionTTLInSeconds": {
                             "type": "number"
                         },
@@ -23285,13 +24437,13 @@
         "AWS::Bedrock::Agent.ActionGroupExecutor": {
             "additionalProperties": false,
             "properties": {
+                "CustomControl": {
+                    "type": "string"
+                },
                 "Lambda": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Lambda"
-            ],
             "type": "object"
         },
         "AWS::Bedrock::Agent.AgentActionGroup": {
@@ -23312,6 +24464,9 @@
                 "Description": {
                     "type": "string"
                 },
+                "FunctionSchema": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.FunctionSchema"
+                },
                 "ParentActionGroupSignature": {
                     "type": "string"
                 },
@@ -23343,367 +24498,154 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.InferenceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumLength": {
-                    "type": "number"
-                },
-                "StopSequences": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Temperature": {
-                    "type": "number"
-                },
-                "TopK": {
-                    "type": "number"
-                },
-                "TopP": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Agent.PromptConfiguration": {
+        "AWS::Bedrock::Agent.Function": {
             "additionalProperties": false,
             "properties": {
-                "BasePromptTemplate": {
-                    "type": "string"
-                },
-                "InferenceConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
-                },
-                "ParserMode": {
-                    "type": "string"
-                },
-                "PromptCreationMode": {
+                "Description": {
                     "type": "string"
                 },
-                "PromptState": {
+                "Name": {
                     "type": "string"
                 },
-                "PromptType": {
-                    "type": "string"
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.ParameterDetail"
+                        }
+                    },
+                    "type": "object"
                 }
             },
+            "required": [
+                "Name"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
+        "AWS::Bedrock::Agent.FunctionSchema": {
             "additionalProperties": false,
             "properties": {
-                "OverrideLambda": {
-                    "type": "string"
-                },
-                "PromptConfigurations": {
+                "Functions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.Function"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PromptConfigurations"
+                "Functions"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.S3Identifier": {
+        "AWS::Bedrock::Agent.GuardrailConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "S3BucketName": {
+                "GuardrailIdentifier": {
                     "type": "string"
                 },
-                "S3ObjectKey": {
+                "GuardrailVersion": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias": {
+        "AWS::Bedrock::Agent.InferenceConfiguration": {
             "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"
+                "MaximumLength": {
+                    "type": "number"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "AgentAliasName": {
-                            "type": "string"
-                        },
-                        "AgentId": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "RoutingConfiguration": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "AgentAliasName",
-                        "AgentId"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::AgentAlias"
-                    ],
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+        "AWS::Bedrock::Agent.ParameterDetail": {
             "additionalProperties": false,
             "properties": {
-                "EndDate": {
+                "Description": {
                     "type": "string"
                 },
-                "RoutingConfiguration": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                    },
-                    "type": "array"
+                "Required": {
+                    "type": "boolean"
                 },
-                "StartDate": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
-            "additionalProperties": false,
-            "properties": {
-                "AgentVersion": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "AgentVersion"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource": {
+        "AWS::Bedrock::Agent.PromptConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "BasePromptTemplate": {
                     "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": {
-                        "DataSourceConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "KnowledgeBaseId": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ServerSideEncryptionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
-                        },
-                        "VectorIngestionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
-                        }
-                    },
-                    "required": [
-                        "DataSourceConfiguration",
-                        "KnowledgeBaseId",
-                        "Name"
-                    ],
-                    "type": "object"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::DataSource"
-                    ],
+                "ParserMode": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingStrategy": {
+                "PromptCreationMode": {
                     "type": "string"
                 },
-                "FixedSizeChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
-                }
-            },
-            "required": [
-                "ChunkingStrategy"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3Configuration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
-                },
-                "Type": {
+                "PromptState": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "S3Configuration",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxTokens": {
-                    "type": "number"
                 },
-                "OverlapPercentage": {
-                    "type": "number"
+                "PromptType": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "MaxTokens",
-                "OverlapPercentage"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BucketArn": {
+                "OverrideLambda": {
                     "type": "string"
                 },
-                "InclusionPrefixes": {
+                "PromptConfigurations": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "BucketArn"
+                "PromptConfigurations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+        "AWS::Bedrock::Agent.S3Identifier": {
             "additionalProperties": false,
             "properties": {
-                "KmsKeyArn": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectKey": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Guardrail": {
+        "AWS::Bedrock::AgentAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -23738,50 +24680,155 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BlockedInputMessaging": {
+                        "AgentAliasName": {
                             "type": "string"
                         },
-                        "BlockedOutputsMessaging": {
+                        "AgentId": {
                             "type": "string"
                         },
-                        "ContentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
-                            "type": "string"
+                        "RoutingConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                            },
+                            "type": "array"
                         },
-                        "Name": {
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AgentAliasName",
+                        "AgentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Bedrock::AgentAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EndDate": {
+                    "type": "string"
+                },
+                "RoutingConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                    },
+                    "type": "array"
+                },
+                "StartDate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SensitiveInformationPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
-                        },
-                        "Tags": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDeletionPolicy": {
+                            "type": "string"
                         },
-                        "TopicPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
                         },
-                        "WordPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KnowledgeBaseId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
+                        },
+                        "VectorIngestionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
                         }
                     },
                     "required": [
-                        "BlockedInputMessaging",
-                        "BlockedOutputsMessaging",
+                        "DataSourceConfiguration",
+                        "KnowledgeBaseId",
                         "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::Guardrail"
+                        "AWS::Bedrock::DataSource"
                     ],
                     "type": "string"
                 },
@@ -23800,46 +24847,144 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
+        "AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "InputStrength": {
+                "ModelArn": {
                     "type": "string"
                 },
-                "OutputStrength": {
+                "ParsingPrompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingPrompt"
+                }
+            },
+            "required": [
+                "ModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingStrategy": {
+                    "type": "string"
+                },
+                "FixedSizeChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
+                },
+                "HierarchicalChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration"
+                },
+                "SemanticChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SemanticChunkingConfiguration"
+                }
+            },
+            "required": [
+                "ChunkingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
+                "HostType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostType",
+                "HostUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.CrawlFilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PatternObjectFilter": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilterConfiguration"
+                },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InputStrength",
-                "OutputStrength",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
+        "AWS::Bedrock::DataSource.CustomTransformationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FiltersConfig": {
+                "IntermediateStorage": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.IntermediateStorage"
+                },
+                "Transformations": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.Transformation"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "FiltersConfig"
+                "IntermediateStorage",
+                "Transformations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointDataSourceConfiguration"
+                },
                 "Type": {
                     "type": "string"
+                },
+                "WebConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebDataSourceConfiguration"
                 }
             },
             "required": [
@@ -23847,135 +24992,438 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "Type": {
-                    "type": "string"
+                "OverlapPercentage": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Action",
-                "Type"
+                "MaxTokens",
+                "OverlapPercentage"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.RegexConfig": {
+        "AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "LevelConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration"
+                    },
+                    "type": "array"
                 },
-                "Description": {
-                    "type": "string"
+                "OverlapTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LevelConfigurations",
+                "OverlapTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.IntermediateStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockFoundationModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration"
                 },
-                "Name": {
+                "ParsingStrategy": {
                     "type": "string"
-                },
-                "Pattern": {
+                }
+            },
+            "required": [
+                "ParsingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingPrompt": {
+            "additionalProperties": false,
+            "properties": {
+                "ParsingPromptText": {
                     "type": "string"
                 }
             },
             "required": [
-                "Action",
-                "Name",
-                "Pattern"
+                "ParsingPromptText"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilter": {
             "additionalProperties": false,
             "properties": {
-                "PiiEntitiesConfig": {
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "RegexesConfig": {
+                "InclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "ObjectType": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ObjectType"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilterConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Definition": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Filters"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
                     "type": "string"
                 },
-                "Examples": {
+                "BucketOwnerAccountId": {
+                    "type": "string"
+                },
+                "InclusionPrefixes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "BucketArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "URI"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration"
                 },
-                "Name": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
                     "type": "string"
                 },
-                "Type": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "HostUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Definition",
-                "Name",
-                "Type"
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostUrl"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
+        "AWS::Bedrock::DataSource.SeedUrl": {
             "additionalProperties": false,
             "properties": {
-                "TopicsConfig": {
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SemanticChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BreakpointPercentileThreshold": {
+                    "type": "number"
+                },
+                "BufferSize": {
+                    "type": "number"
+                },
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BreakpointPercentileThreshold",
+                "BufferSize",
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                },
+                "HostType": {
+                    "type": "string"
+                },
+                "SiteUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "TenantId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TopicsConfig"
+                "AuthType",
+                "CredentialsSecretArn",
+                "Domain",
+                "HostType",
+                "SiteUrls"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordConfig": {
+        "AWS::Bedrock::DataSource.Transformation": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
+                "StepToApply": {
                     "type": "string"
+                },
+                "TransformationFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationFunction"
                 }
             },
             "required": [
-                "Text"
+                "StepToApply",
+                "TransformationFunction"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+        "AWS::Bedrock::DataSource.TransformationFunction": {
             "additionalProperties": false,
             "properties": {
-                "ManagedWordListsConfig": {
+                "TransformationLambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationLambdaConfiguration"
+                }
+            },
+            "required": [
+                "TransformationLambdaConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.TransformationLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.UrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.SeedUrl"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
                 },
-                "WordsConfig": {
+                "CustomTransformationConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CustomTransformationConfiguration"
+                },
+                "ParsingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerLimits": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerLimits"
+                },
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionFilters": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "Scope": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase": {
+        "AWS::Bedrock::DataSource.WebCrawlerLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "UrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.UrlConfiguration"
+                }
+            },
+            "required": [
+                "UrlConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24010,20 +25458,35 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "KnowledgeBaseConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDefinition"
                         },
-                        "Name": {
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.S3Location"
+                        },
+                        "DefinitionString": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StorageConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
                         },
                         "Tags": {
                             "additionalProperties": true,
@@ -24033,19 +25496,26 @@
                                 }
                             },
                             "type": "object"
+                        },
+                        "TestAliasTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "KnowledgeBaseConfiguration",
-                        "Name",
-                        "RoleArn",
-                        "StorageConfiguration"
+                        "ExecutionRoleArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::KnowledgeBase"
+                        "AWS::Bedrock::Flow"
                     ],
                     "type": "string"
                 },
@@ -24064,187 +25534,517 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "AgentAliasArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.ConditionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
                     "type": "string"
                 },
-                "VectorKnowledgeBaseConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                "Name": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "VectorKnowledgeBaseConfiguration"
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+        "AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CollectionArn": {
+                "Condition": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnectionConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                "Name": {
+                    "type": "string"
                 },
-                "VectorIndexName": {
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "CollectionArn",
-                "FieldMapping",
-                "VectorIndexName"
+                "Name",
+                "Source",
+                "Target",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+        "AWS::Bedrock::Flow.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
-                    "type": "string"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration"
                 },
-                "TextField": {
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
                     "type": "string"
                 },
-                "VectorField": {
+                "TargetInput": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField",
-                "VectorField"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+        "AWS::Bedrock::Flow.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionString": {
+                "Connections": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnection"
+                    },
+                    "type": "array"
+                },
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNode"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeConfiguration"
+                },
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "CredentialsSecretArn": {
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeOutput"
+                    },
+                    "type": "array"
+                },
+                "Type": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.AgentFlowNodeConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                "Collector": {
+                    "type": "object"
                 },
-                "Namespace": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.ConditionFlowNodeConfiguration"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Iterator": {
+                    "type": "object"
+                },
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration"
+                },
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "ConnectionString",
-                "CredentialsSecretArn",
-                "FieldMapping"
+                "Expression",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+        "AWS::Bedrock::Flow.FlowNodeOutput": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "Name": {
                     "type": "string"
                 },
-                "TextField": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+        "AWS::Bedrock::Flow.FlowValidation": {
             "additionalProperties": false,
             "properties": {
-                "CredentialsSecretArn": {
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
                     "type": "string"
                 },
-                "DatabaseName": {
+                "ModelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LexFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                "LocaleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BotAliasArn",
+                "LocaleId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInferenceConfiguration"
                 },
-                "ResourceArn": {
+                "ModelId": {
                     "type": "string"
                 },
-                "TableName": {
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "CredentialsSecretArn",
-                "DatabaseName",
-                "FieldMapping",
-                "ResourceArn",
-                "TableName"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+        "AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "PromptArn": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration"
                 },
-                "PrimaryKeyField": {
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "TextField": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "VectorField": {
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "PrimaryKeyField",
-                "TextField",
-                "VectorField"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+        "AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "OpensearchServerlessConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
-                },
-                "PineconeConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
                 },
-                "RdsConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "Type": {
+                "Version": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.StorageFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "EmbeddingModelArn": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.StorageFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "EmbeddingModelArn"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup": {
+        "AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24279,39 +26079,41 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountGrouping": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
-                        },
-                        "ComputationPreference": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
                         },
-                        "PrimaryAccountId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "RoutingConfiguration": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "AccountGrouping",
-                        "ComputationPreference",
+                        "FlowArn",
                         "Name",
-                        "PrimaryAccountId"
+                        "RoutingConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::BillingGroup"
+                        "AWS::Bedrock::FlowAlias"
                     ],
                     "type": "string"
                 },
@@ -24330,37 +26132,16 @@
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoAssociate": {
-                    "type": "boolean"
-                },
-                "LinkedAccountIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "LinkedAccountIds"
-            ],
-            "type": "object"
-        },
-        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+        "AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem": {
             "additionalProperties": false,
             "properties": {
-                "PricingPlanArn": {
+                "FlowVersion": {
                     "type": "string"
                 }
             },
-            "required": [
-                "PricingPlanArn"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem": {
+        "AWS::Bedrock::FlowVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24395,40 +26176,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountId": {
-                            "type": "string"
-                        },
-                        "BillingGroupArn": {
-                            "type": "string"
-                        },
-                        "BillingPeriodRange": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
-                        },
-                        "CustomLineItemChargeDetails": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
                     "required": [
-                        "BillingGroupArn",
-                        "Name"
+                        "FlowArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::CustomLineItem"
+                        "AWS::Bedrock::FlowVersion"
                     ],
                     "type": "string"
                 },
@@ -24447,557 +26209,486 @@
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+        "AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ExclusiveEndBillingPeriod": {
-                    "type": "string"
-                },
-                "InclusiveStartBillingPeriod": {
+                "AgentAliasArn": {
                     "type": "string"
                 }
             },
-            "type": "object"
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+        "AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Flat": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
-                },
-                "LineItemFilters": {
+                "Conditions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowCondition"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
                 },
-                "Percentage": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnectionConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
                 },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
+                "Name",
+                "Source",
+                "Target",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ChargeValue": {
-                    "type": "number"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration"
+                },
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
+                    "type": "string"
+                },
+                "TargetInput": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ChargeValue"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ChildAssociatedResources": {
+                "Connections": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnection"
                     },
                     "type": "array"
                 },
-                "PercentageValue": {
-                    "type": "number"
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNode"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "PercentageValue"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+        "AWS::Bedrock::FlowVersion.FlowNode": {
             "additionalProperties": false,
             "properties": {
-                "Attribute": {
-                    "type": "string"
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeConfiguration"
                 },
-                "MatchOption": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Values": {
+                "Outputs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeOutput"
                     },
                     "type": "array"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Attribute",
-                "MatchOption",
-                "Values"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingPlan": {
+        "AWS::Bedrock::FlowVersion.FlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Collector": {
+                    "type": "object"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration"
                 },
-                "Metadata": {
+                "Input": {
                     "type": "object"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "PricingRuleArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name"
-                    ],
+                "Iterator": {
                     "type": "object"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingPlan"
-                    ],
-                    "type": "string"
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule": {
+        "AWS::Bedrock::FlowVersion.FlowNodeInput": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Name": {
                     "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": {
-                        "BillingEntity": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ModifierPercentage": {
-                            "type": "number"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Operation": {
-                            "type": "string"
-                        },
-                        "Scope": {
-                            "type": "string"
-                        },
-                        "Service": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Tiering": {
-                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "UsageType": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "Scope",
-                        "Type"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingRule"
-                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowNodeOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.FreeTier": {
+        "AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Activated": {
-                    "type": "boolean"
+                "KnowledgeBaseId": {
+                    "type": "string"
+                },
+                "ModelId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Activated"
+                "KnowledgeBaseId"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.Tiering": {
+        "AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FreeTier": {
-                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
+                "LambdaArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "LambdaArn"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::Budget": {
+        "AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration": {
             "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": {
-                        "Budget": {
-                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
-                        },
-                        "NotificationsWithSubscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Budget"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Budgets::Budget"
-                    ],
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "LocaleId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "BotAliasArn",
+                "LocaleId"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.AutoAdjustData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustType": {
-                    "type": "string"
-                },
-                "HistoricalOptions": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration"
                 }
             },
             "required": [
-                "AutoAdjustType"
+                "SourceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.BudgetData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustData": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
-                },
-                "BudgetLimit": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
-                },
-                "BudgetName": {
-                    "type": "string"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInferenceConfiguration"
                 },
-                "BudgetType": {
+                "ModelId": {
                     "type": "string"
                 },
-                "CostFilters": {
-                    "type": "object"
-                },
-                "CostTypes": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
-                },
-                "PlannedBudgetLimits": {
-                    "type": "object"
-                },
-                "TimePeriod": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptTemplateConfiguration"
                 },
-                "TimeUnit": {
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "BudgetType",
-                "TimeUnit"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.CostTypes": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "IncludeCredit": {
-                    "type": "boolean"
-                },
-                "IncludeDiscount": {
-                    "type": "boolean"
-                },
-                "IncludeOtherSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeRecurring": {
-                    "type": "boolean"
-                },
-                "IncludeRefund": {
-                    "type": "boolean"
-                },
-                "IncludeSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeSupport": {
-                    "type": "boolean"
-                },
-                "IncludeTax": {
-                    "type": "boolean"
-                },
-                "IncludeUpfront": {
-                    "type": "boolean"
-                },
-                "UseAmortized": {
-                    "type": "boolean"
+                "PromptArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration"
                 },
-                "UseBlended": {
-                    "type": "boolean"
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration"
                 }
             },
             "type": "object"
         },
-        "AWS::Budgets::Budget.HistoricalOptions": {
+        "AWS::Bedrock::FlowVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BudgetAdjustmentPeriod": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "BudgetAdjustmentPeriod"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Notification": {
+        "AWS::Bedrock::FlowVersion.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "ComparisonOperator": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "NotificationType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Threshold": {
+                "Temperature": {
                     "type": "number"
                 },
-                "ThresholdType": {
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ComparisonOperator",
-                "NotificationType",
-                "Threshold"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Notification": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
-                },
-                "Subscribers": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
-                    },
-                    "type": "array"
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Notification",
-                "Subscribers"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Spend": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Amount": {
-                    "type": "number"
-                },
-                "Unit": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Amount",
-                "Unit"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Subscriber": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "SubscriptionType": {
-                    "type": "string"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Address",
-                "SubscriptionType"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.TimePeriod": {
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "End": {
+                "BucketName": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInputVariable"
+                    },
+                    "type": "array"
                 },
-                "Start": {
+                "Text": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Text"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction": {
+        "AWS::Bedrock::Guardrail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25032,48 +26723,53 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionThreshold": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
-                        },
-                        "ActionType": {
+                        "BlockedInputMessaging": {
                             "type": "string"
                         },
-                        "ApprovalModel": {
+                        "BlockedOutputsMessaging": {
                             "type": "string"
                         },
-                        "BudgetName": {
-                            "type": "string"
+                        "ContentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
                         },
-                        "Definition": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        "ContextualGroundingPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig"
                         },
-                        "ExecutionRoleArn": {
+                        "Description": {
                             "type": "string"
                         },
-                        "NotificationType": {
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Subscribers": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SensitiveInformationPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
+                        },
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TopicPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        },
+                        "WordPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
                         }
                     },
                     "required": [
-                        "ActionThreshold",
-                        "ActionType",
-                        "BudgetName",
-                        "Definition",
-                        "ExecutionRoleArn",
-                        "NotificationType",
-                        "Subscribers"
+                        "BlockedInputMessaging",
+                        "BlockedOutputsMessaging",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Budgets::BudgetsAction"
+                        "AWS::Bedrock::Guardrail"
                     ],
                     "type": "string"
                 },
@@ -25092,113 +26788,88 @@
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "InputStrength": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "number"
+                "OutputStrength": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Value"
+                "InputStrength",
+                "OutputStrength",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Definition": {
+        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "IamActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
-                },
-                "ScpActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
-                },
-                "SsmActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                "FiltersConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "FiltersConfig"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Groups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Threshold": {
+                    "type": "number"
                 },
-                "PolicyArn": {
+                "Type": {
                     "type": "string"
-                },
-                "Roles": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Users": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
             "required": [
-                "PolicyArn"
+                "Threshold",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "PolicyId": {
-                    "type": "string"
-                },
-                "TargetIds": {
+                "FiltersConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PolicyId",
-                "TargetIds"
+                "FiltersConfig"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "Subtype": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InstanceIds",
-                "Region",
-                "Subtype"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Subscriber": {
+        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
+                "Action": {
                     "type": "string"
                 },
                 "Type": {
@@ -25206,239 +26877,124 @@
                 }
             },
             "required": [
-                "Address",
+                "Action",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor": {
+        "AWS::Bedrock::Guardrail.RegexConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Action": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Description": {
                     "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": {
-                        "MonitorDimension": {
-                            "type": "string"
-                        },
-                        "MonitorName": {
-                            "type": "string"
-                        },
-                        "MonitorSpecification": {
-                            "type": "string"
-                        },
-                        "MonitorType": {
-                            "type": "string"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "MonitorName",
-                        "MonitorType"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalyMonitor"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Pattern": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Action",
+                "Name",
+                "Pattern"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor.ResourceTag": {
+        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
+                "PiiEntitiesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                    },
+                    "type": "array"
                 },
-                "Value": {
-                    "type": "string"
+                "RegexesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription": {
+        "AWS::Bedrock::Guardrail.TopicConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Definition": {
                     "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": {
-                        "Frequency": {
-                            "type": "string"
-                        },
-                        "MonitorArnList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
-                            },
-                            "type": "array"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
-                            },
-                            "type": "array"
-                        },
-                        "SubscriptionName": {
-                            "type": "string"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdExpression": {
-                            "type": "string"
-                        }
+                "Examples": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Frequency",
-                        "MonitorArnList",
-                        "Subscribers",
-                        "SubscriptionName"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalySubscription"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Definition",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.ResourceTag": {
+        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "TopicsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "TopicsConfig"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.Subscriber": {
+        "AWS::Bedrock::Guardrail.WordConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "Status": {
-                    "type": "string"
-                },
-                "Type": {
+                "Text": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::CE::CostCategory": {
+        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ManagedWordListsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                    },
+                    "type": "array"
+                },
+                "WordsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::GuardrailVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25473,32 +27029,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultValue": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RuleVersion": {
-                            "type": "string"
-                        },
-                        "Rules": {
+                        "Description": {
                             "type": "string"
                         },
-                        "SplitChargeRules": {
+                        "GuardrailIdentifier": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RuleVersion",
-                        "Rules"
+                        "GuardrailIdentifier"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CE::CostCategory"
+                        "AWS::Bedrock::GuardrailVersion"
                     ],
                     "type": "string"
                 },
@@ -25517,7 +27062,7 @@
             ],
             "type": "object"
         },
-        "AWS::CUR::ReportDefinition": {
+        "AWS::Bedrock::KnowledgeBase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25552,65 +27097,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalArtifacts": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AdditionalSchemaElements": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BillingViewArn": {
-                            "type": "string"
-                        },
-                        "Compression": {
-                            "type": "string"
-                        },
-                        "Format": {
-                            "type": "string"
-                        },
-                        "RefreshClosedReports": {
-                            "type": "boolean"
-                        },
-                        "ReportName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ReportVersioning": {
-                            "type": "string"
+                        "KnowledgeBaseConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
                         },
-                        "S3Bucket": {
+                        "Name": {
                             "type": "string"
                         },
-                        "S3Prefix": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "S3Region": {
-                            "type": "string"
+                        "StorageConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
                         },
-                        "TimeUnit": {
-                            "type": "string"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "Compression",
-                        "Format",
-                        "RefreshClosedReports",
-                        "ReportName",
-                        "ReportVersioning",
-                        "S3Bucket",
-                        "S3Prefix",
-                        "S3Region",
-                        "TimeUnit"
+                        "KnowledgeBaseConfiguration",
+                        "Name",
+                        "RoleArn",
+                        "StorageConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CUR::ReportDefinition"
+                        "AWS::Bedrock::KnowledgeBase"
                     ],
                     "type": "string"
                 },
@@ -25629,92 +27151,266 @@
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace": {
+        "AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Dimensions": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockEmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "VectorKnowledgeBaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                }
+            },
+            "required": [
+                "Type",
+                "VectorKnowledgeBaseConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionName": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "CredentialsSecretArn": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "KeyspaceName": {
-                            "type": "string"
-                        },
-                        "ReplicationSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "type": "object"
+                "Endpoint": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Cassandra::Keyspace"
-                    ],
+                "EndpointServiceName": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping"
+                },
+                "VectorIndexName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "CollectionName",
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "Endpoint",
+                "FieldMapping",
+                "VectorIndexName"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "RegionList": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "MetadataField": {
+                    "type": "string"
                 },
-                "ReplicationStrategy": {
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
                     "type": "string"
                 }
             },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                },
+                "VectorIndexName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionArn",
+                "FieldMapping",
+                "VectorIndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionString": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectionString",
+                "CredentialsSecretArn",
+                "FieldMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "FieldMapping",
+                "ResourceArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "PrimaryKeyField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "PrimaryKeyField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MongoDbAtlasConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration"
+                },
+                "OpensearchServerlessConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
+                },
+                "PineconeConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                },
+                "RdsConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EmbeddingModelArn": {
+                    "type": "string"
+                },
+                "EmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration"
+                }
+            },
+            "required": [
+                "EmbeddingModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Prompt": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25749,70 +27445,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoScalingSpecifications": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
-                        },
-                        "BillingMode": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
-                        },
-                        "ClientSideTimestampsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ClusteringKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
-                            },
-                            "type": "array"
-                        },
-                        "DefaultTimeToLive": {
-                            "type": "number"
-                        },
-                        "EncryptionSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
-                        },
-                        "KeyspaceName": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "PartitionKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
-                        },
-                        "PointInTimeRecoveryEnabled": {
-                            "type": "boolean"
-                        },
-                        "RegularColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
+                        "DefaultVariant": {
+                            "type": "string"
                         },
-                        "ReplicaSpecifications": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
                         },
-                        "TableName": {
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptVariant"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "KeyspaceName",
-                        "PartitionKeyColumns"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cassandra::Table"
+                        "AWS::Bedrock::Prompt"
                     ],
                     "type": "string"
                 },
@@ -25831,162 +27499,126 @@
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.AutoScalingSetting": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoScalingDisabled": {
-                    "type": "boolean"
-                },
-                "MaximumUnits": {
-                    "type": "number"
-                },
-                "MinimumUnits": {
-                    "type": "number"
-                },
-                "ScalingPolicy": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.AutoScalingSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                },
-                "WriteCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.BillingMode": {
+        "AWS::Bedrock::Prompt.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Mode": {
-                    "type": "string"
-                },
-                "ProvisionedThroughput": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "Mode"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+        "AWS::Bedrock::Prompt.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "Column": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                },
-                "OrderBy": {
+                "Name": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Column"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.Column": {
+        "AWS::Bedrock::Prompt.PromptModelInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "ColumnType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnType"
-            ],
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.EncryptionSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "EncryptionType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "KmsKeyIdentifier": {
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "EncryptionType"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ProvisionedThroughput": {
+        "AWS::Bedrock::Prompt.PromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityUnits": {
-                    "type": "number"
-                },
-                "WriteCapacityUnits": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ReadCapacityUnits",
-                "WriteCapacityUnits"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ReplicaSpecification": {
+        "AWS::Bedrock::Prompt.PromptVariant": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInferenceConfiguration"
                 },
-                "ReadCapacityUnits": {
-                    "type": "number"
+                "ModelId": {
+                    "type": "string"
                 },
-                "Region": {
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Region"
+                "Name",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ScalingPolicy": {
+        "AWS::Bedrock::Prompt.TextPromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "TargetTrackingScalingPolicyConfiguration": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextS3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextS3Location"
                 }
             },
             "type": "object"
         },
-        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+        "AWS::Bedrock::Prompt.TextS3Location": {
             "additionalProperties": false,
             "properties": {
-                "DisableScaleIn": {
-                    "type": "boolean"
-                },
-                "ScaleInCooldown": {
-                    "type": "number"
+                "Bucket": {
+                    "type": "string"
                 },
-                "ScaleOutCooldown": {
-                    "type": "number"
+                "Key": {
+                    "type": "string"
                 },
-                "TargetValue": {
-                    "type": "number"
+                "Version": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TargetValue"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account": {
+        "AWS::Bedrock::PromptVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26021,18 +27653,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExpiryEventsConfiguration": {
-                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PromptArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "ExpiryEventsConfiguration"
+                        "PromptArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Account"
+                        "AWS::Bedrock::PromptVersion"
                     ],
                     "type": "string"
                 },
@@ -26051,16 +27695,107 @@
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+        "AWS::Bedrock::PromptVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "DaysBeforeExpiry": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                },
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
                     "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate": {
+        "AWS::Bedrock::PromptVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInferenceConfiguration"
+                },
+                "ModelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "TemplateType"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26095,48 +27830,39 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CertificateAuthorityArn": {
-                            "type": "string"
+                        "AccountGrouping": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
                         },
-                        "CertificateTransparencyLoggingPreference": {
-                            "type": "string"
+                        "ComputationPreference": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
                         },
-                        "DomainName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "DomainValidationOptions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
-                            },
-                            "type": "array"
-                        },
-                        "KeyAlgorithm": {
+                        "Name": {
                             "type": "string"
                         },
-                        "SubjectAlternativeNames": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "PrimaryAccountId": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ValidationMethod": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "AccountGrouping",
+                        "ComputationPreference",
+                        "Name",
+                        "PrimaryAccountId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Certificate"
+                        "AWS::BillingConductor::BillingGroup"
                     ],
                     "type": "string"
                 },
@@ -26155,25 +27881,37 @@
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "HostedZoneId": {
-                    "type": "string"
+                "AutoAssociate": {
+                    "type": "boolean"
                 },
-                "ValidationDomain": {
+                "LinkedAccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LinkedAccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "PricingPlanArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "DomainName"
+                "PricingPlanArn"
             ],
             "type": "object"
         },
-        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26208,52 +27946,40 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
-                            "type": "string"
-                        },
-                        "GuardrailPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "IamRoleArn": {
+                        "AccountId": {
                             "type": "string"
                         },
-                        "LoggingLevel": {
+                        "BillingGroupArn": {
                             "type": "string"
                         },
-                        "SnsTopicArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "BillingPeriodRange": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
                         },
-                        "TeamId": {
-                            "type": "string"
+                        "CustomLineItemChargeDetails": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
                         },
-                        "TeamsChannelId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TeamsTenantId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "UserRoleRequired": {
-                            "type": "boolean"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "TeamId",
-                        "TeamsChannelId",
-                        "TeamsTenantId"
+                        "BillingGroupArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
+                        "AWS::BillingConductor::CustomLineItem"
                     ],
                     "type": "string"
                 },
@@ -26272,7 +27998,96 @@
             ],
             "type": "object"
         },
-        "AWS::Chatbot::SlackChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+            "additionalProperties": false,
+            "properties": {
+                "ExclusiveEndBillingPeriod": {
+                    "type": "string"
+                },
+                "InclusiveStartBillingPeriod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Flat": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
+                },
+                "LineItemFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                    },
+                    "type": "array"
+                },
+                "Percentage": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChargeValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChargeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssociatedResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PercentageValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "PercentageValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MatchOption": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attribute",
+                "MatchOption",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::PricingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26307,48 +28122,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "GuardrailPolicies": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PricingRuleArns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "IamRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingLevel": {
-                            "type": "string"
-                        },
-                        "SlackChannelId": {
-                            "type": "string"
-                        },
-                        "SlackWorkspaceId": {
-                            "type": "string"
-                        },
-                        "SnsTopicArns": {
+                        "Tags": {
                             "items": {
-                                "type": "string"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserRoleRequired": {
-                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "SlackChannelId",
-                        "SlackWorkspaceId"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::SlackChannelConfiguration"
+                        "AWS::BillingConductor::PricingPlan"
                     ],
                     "type": "string"
                 },
@@ -26367,7 +28167,7 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate": {
+        "AWS::BillingConductor::PricingRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26402,45 +28202,53 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AnalysisParameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
-                            },
-                            "type": "array"
+                        "BillingEntity": {
+                            "type": "string"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "Format": {
+                        "ModifierPercentage": {
+                            "type": "number"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Operation": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Scope": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        "Service": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Tiering": {
+                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UsageType": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "MembershipIdentifier",
                         "Name",
-                        "Source"
+                        "Scope",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::AnalysisTemplate"
+                        "AWS::BillingConductor::PricingRule"
                     ],
                     "type": "string"
                 },
@@ -26459,53 +28267,28 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
-            "additionalProperties": false,
-            "properties": {
-                "DefaultValue": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+        "AWS::BillingConductor::PricingRule.FreeTier": {
             "additionalProperties": false,
             "properties": {
-                "ReferencedTables": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Activated": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "ReferencedTables"
+                "Activated"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+        "AWS::BillingConductor::PricingRule.Tiering": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
-                    "type": "string"
+                "FreeTier": {
+                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
                 }
             },
-            "required": [
-                "Text"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration": {
+        "AWS::Budgets::Budget": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26540,56 +28323,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CreatorDisplayName": {
-                            "type": "string"
-                        },
-                        "CreatorMemberAbilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "CreatorPaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
-                        },
-                        "DataEncryptionMetadata": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
-                        },
-                        "Description": {
-                            "type": "string"
+                        "Budget": {
+                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
                         },
-                        "Members": {
+                        "NotificationsWithSubscribers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
                             },
                             "type": "array"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "CreatorDisplayName",
-                        "CreatorMemberAbilities",
-                        "Description",
-                        "Members",
-                        "Name",
-                        "QueryLogStatus"
+                        "Budget"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Collaboration"
+                        "AWS::Budgets::Budget"
                     ],
                     "type": "string"
                 },
@@ -26608,89 +28365,219 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+        "AWS::Budgets::Budget.AutoAdjustData": {
             "additionalProperties": false,
             "properties": {
-                "AllowCleartext": {
-                    "type": "boolean"
-                },
-                "AllowDuplicates": {
-                    "type": "boolean"
-                },
-                "AllowJoinsOnColumnsWithDifferentNames": {
-                    "type": "boolean"
+                "AutoAdjustType": {
+                    "type": "string"
                 },
-                "PreserveNulls": {
-                    "type": "boolean"
+                "HistoricalOptions": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
                 }
             },
             "required": [
-                "AllowCleartext",
-                "AllowDuplicates",
-                "AllowJoinsOnColumnsWithDifferentNames",
-                "PreserveNulls"
+                "AutoAdjustType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+        "AWS::Budgets::Budget.BudgetData": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "AutoAdjustData": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
+                },
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
                     "type": "string"
                 },
-                "DisplayName": {
+                "BudgetType": {
                     "type": "string"
                 },
-                "MemberAbilities": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "CostFilters": {
+                    "type": "object"
                 },
-                "PaymentConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AccountId",
-                "DisplayName",
-                "MemberAbilities"
+                "BudgetType",
+                "TimeUnit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+        "AWS::Budgets::Budget.CostTypes": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                "IncludeCredit": {
+                    "type": "boolean"
+                },
+                "IncludeDiscount": {
+                    "type": "boolean"
+                },
+                "IncludeOtherSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeRecurring": {
+                    "type": "boolean"
+                },
+                "IncludeRefund": {
+                    "type": "boolean"
+                },
+                "IncludeSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeSupport": {
+                    "type": "boolean"
+                },
+                "IncludeTax": {
+                    "type": "boolean"
+                },
+                "IncludeUpfront": {
+                    "type": "boolean"
+                },
+                "UseAmortized": {
+                    "type": "boolean"
+                },
+                "UseBlended": {
+                    "type": "boolean"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+        "AWS::Budgets::Budget.HistoricalOptions": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "BudgetAdjustmentPeriod": {
+                    "type": "number"
                 }
             },
             "required": [
-                "IsResponsible"
+                "BudgetAdjustmentPeriod"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable": {
+        "AWS::Budgets::Budget.Notification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ComparisonOperator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
+                "NotificationType": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "ThresholdType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "NotificationType",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+            "additionalProperties": false,
+            "properties": {
+                "Notification": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
+                },
+                "Subscribers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Notification",
+                "Subscribers"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Spend": {
+            "additionalProperties": false,
+            "properties": {
+                "Amount": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Amount",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "SubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "SubscriptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.TimePeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
                         "Retain",
                         "Snapshot"
                     ],
@@ -26717,48 +28604,54 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowedColumns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
                         },
-                        "AnalysisMethod": {
+                        "ActionType": {
                             "type": "string"
                         },
-                        "AnalysisRules": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
-                            },
-                            "type": "array"
+                        "ApprovalModel": {
+                            "type": "string"
                         },
-                        "Description": {
+                        "BudgetName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "TableReference": {
-                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        "NotificationType": {
+                            "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "AllowedColumns",
-                        "AnalysisMethod",
-                        "Name",
-                        "TableReference"
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTable"
+                        "AWS::Budgets::BudgetsAction"
                     ],
                     "type": "string"
                 },
@@ -26777,98 +28670,56 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "ColumnNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Function": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnNames",
-                "Function"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Type": {
                     "type": "string"
                 },
-                "Minimum": {
+                "Value": {
                     "type": "number"
-                },
-                "Type": {
-                    "type": "string"
                 }
             },
             "required": [
-                "ColumnName",
-                "Minimum",
-                "Type"
+                "Type",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+        "AWS::Budgets::BudgetsAction.Definition": {
             "additionalProperties": false,
             "properties": {
-                "Policy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
                 },
-                "Type": {
-                    "type": "string"
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
                 }
             },
-            "required": [
-                "Policy",
-                "Type"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AggregateColumns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
-                    },
-                    "type": "array"
-                },
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DimensionColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
+                "Groups": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "JoinRequired": {
+                "PolicyArn": {
                     "type": "string"
                 },
-                "OutputConstraints": {
+                "Roles": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "ScalarFunctions": {
+                "Users": {
                     "items": {
                         "type": "string"
                     },
@@ -26876,54 +28727,33 @@
                 }
             },
             "required": [
-                "AggregateColumns",
-                "DimensionColumns",
-                "JoinColumns",
-                "OutputConstraints",
-                "ScalarFunctions"
+                "PolicyArn"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+        "AWS::Budgets::BudgetsAction.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "AllowedAnalyses": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AllowedAnalysisProviders": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
                 },
-                "DifferentialPrivacy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AllowedAnalyses"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "PolicyId": {
+                    "type": "string"
                 },
-                "ListColumns": {
+                "TargetIds": {
                     "items": {
                         "type": "string"
                     },
@@ -26931,94 +28761,51 @@
                 }
             },
             "required": [
-                "JoinColumns",
-                "ListColumns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "V1": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
-                }
-            },
-            "required": [
-                "V1"
+                "PolicyId",
+                "TargetIds"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
-            "additionalProperties": false,
-            "properties": {
-                "Aggregation": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
-                },
-                "Custom": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
-                },
-                "List": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Columns": {
+                "InstanceIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "Columns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "Name": {
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name"
+                "InstanceIds",
+                "Region",
+                "Subtype"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+        "AWS::Budgets::BudgetsAction.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "DatabaseName": {
+                "Address": {
                     "type": "string"
                 },
-                "TableName": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "DatabaseName",
-                "TableName"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.TableReference": {
-            "additionalProperties": false,
-            "properties": {
-                "Glue": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
-                }
-            },
-            "required": [
-                "Glue"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTableAssociation": {
+        "AWS::CE::AnomalyMonitor": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27053,39 +28840,34 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfiguredTableIdentifier": {
-                            "type": "string"
-                        },
-                        "Description": {
+                        "MonitorDimension": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "MonitorName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "MonitorSpecification": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "MonitorType": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "ConfiguredTableIdentifier",
-                        "MembershipIdentifier",
-                        "Name",
-                        "RoleArn"
+                        "MonitorName",
+                        "MonitorType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTableAssociation"
+                        "AWS::CE::AnomalyMonitor"
                     ],
                     "type": "string"
                 },
@@ -27104,7 +28886,23 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership": {
+        "AWS::CE::AnomalyMonitor.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27139,34 +28937,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CollaborationIdentifier": {
+                        "Frequency": {
                             "type": "string"
                         },
-                        "DefaultResultConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
-                        },
-                        "PaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
+                        "MonitorArnList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "QueryLogStatus": {
-                            "type": "string"
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
+                            },
+                            "type": "array"
                         },
-                        "Tags": {
+                        "Subscribers": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
                             },
                             "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdExpression": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CollaborationIdentifier",
-                        "QueryLogStatus"
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Membership"
+                        "AWS::CE::AnomalySubscription"
                     ],
                     "type": "string"
                 },
@@ -27185,77 +28997,42 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
-                }
-            },
-            "required": [
-                "QueryCompute"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
-                }
-            },
-            "required": [
-                "S3"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+        "AWS::CE::AnomalySubscription.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "OutputConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "RoleArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "OutputConfiguration"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "IsResponsible"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+        "AWS::CE::AnomalySubscription.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "Address": {
                     "type": "string"
                 },
-                "KeyPrefix": {
+                "Status": {
                     "type": "string"
                 },
-                "ResultFormat": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "ResultFormat"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate": {
+        "AWS::CE::CostCategory": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27290,36 +29067,32 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoRefresh": {
+                        "DefaultValue": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Parameters": {
-                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        "RuleVersion": {
+                            "type": "string"
                         },
-                        "PrivacyBudgetType": {
+                        "Rules": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "SplitChargeRules": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AutoRefresh",
-                        "MembershipIdentifier",
-                        "Parameters",
-                        "PrivacyBudgetType"
+                        "Name",
+                        "RuleVersion",
+                        "Rules"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::PrivacyBudgetTemplate"
+                        "AWS::CE::CostCategory"
                     ],
                     "type": "string"
                 },
@@ -27338,23 +29111,7 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
-            "additionalProperties": false,
-            "properties": {
-                "Epsilon": {
-                    "type": "number"
-                },
-                "UsersNoisePerQuery": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Epsilon",
-                "UsersNoisePerQuery"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset": {
+        "AWS::CUR::ReportDefinition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27389,38 +29146,65 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "AdditionalArtifacts": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "TrainingData": {
+                        "AdditionalSchemaElements": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "BillingViewArn": {
+                            "type": "string"
+                        },
+                        "Compression": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "RefreshClosedReports": {
+                            "type": "boolean"
+                        },
+                        "ReportName": {
+                            "type": "string"
+                        },
+                        "ReportVersioning": {
+                            "type": "string"
+                        },
+                        "S3Bucket": {
+                            "type": "string"
+                        },
+                        "S3Prefix": {
+                            "type": "string"
+                        },
+                        "S3Region": {
+                            "type": "string"
+                        },
+                        "TimeUnit": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RoleArn",
-                        "TrainingData"
+                        "Compression",
+                        "Format",
+                        "RefreshClosedReports",
+                        "ReportName",
+                        "ReportVersioning",
+                        "S3Bucket",
+                        "S3Prefix",
+                        "S3Region",
+                        "TimeUnit"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRoomsML::TrainingDataset"
+                        "AWS::CUR::ReportDefinition"
                     ],
                     "type": "string"
                 },
@@ -27439,92 +29223,92 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
+        "AWS::Cassandra::Keyspace": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Condition": {
                     "type": "string"
                 },
-                "ColumnTypes": {
-                    "items": {
-                        "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": {
+                        "KeyspaceName": {
+                            "type": "string"
+                        },
+                        "ReplicationSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
                     },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnTypes"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "GlueDataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
-                }
-            },
-            "required": [
-                "GlueDataSource"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
-            "additionalProperties": false,
-            "properties": {
-                "InputConfig": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "InputConfig",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
+        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
             "additionalProperties": false,
             "properties": {
-                "DataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
-                },
-                "Schema": {
+                "RegionList": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "DataSource",
-                "Schema"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "CatalogId": {
-                    "type": "string"
-                },
-                "DatabaseName": {
-                    "type": "string"
                 },
-                "TableName": {
+                "ReplicationStrategy": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DatabaseName",
-                "TableName"
-            ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2": {
+        "AWS::Cassandra::Table": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27559,34 +29343,52 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutomaticStopTimeMinutes": {
-                            "type": "number"
+                        "AutoScalingSpecifications": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
                         },
-                        "ConnectionType": {
-                            "type": "string"
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
                         },
-                        "Description": {
-                            "type": "string"
+                        "ClientSideTimestampsEnabled": {
+                            "type": "boolean"
                         },
-                        "ImageId": {
-                            "type": "string"
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
                         },
-                        "InstanceType": {
-                            "type": "string"
+                        "DefaultTimeToLive": {
+                            "type": "number"
                         },
-                        "Name": {
-                            "type": "string"
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
                         },
-                        "OwnerArn": {
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "Repositories": {
+                        "PartitionKeyColumns": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
                             },
                             "type": "array"
                         },
-                        "SubnetId": {
+                        "PointInTimeRecoveryEnabled": {
+                            "type": "boolean"
+                        },
+                        "RegularColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "ReplicaSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TableName": {
                             "type": "string"
                         },
                         "Tags": {
@@ -27597,14 +29399,14 @@
                         }
                     },
                     "required": [
-                        "ImageId",
-                        "InstanceType"
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cloud9::EnvironmentEC2"
+                        "AWS::Cassandra::Table"
                     ],
                     "type": "string"
                 },
@@ -27623,23 +29425,162 @@
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2.Repository": {
+        "AWS::Cassandra::Table.AutoScalingSetting": {
             "additionalProperties": false,
             "properties": {
-                "PathComponent": {
+                "AutoScalingDisabled": {
+                    "type": "boolean"
+                },
+                "MaximumUnits": {
+                    "type": "number"
+                },
+                "MinimumUnits": {
+                    "type": "number"
+                },
+                "ScalingPolicy": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.AutoScalingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "WriteCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.BillingMode": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
                     "type": "string"
                 },
-                "RepositoryUrl": {
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                },
+                "OrderBy": {
                     "type": "string"
                 }
             },
             "required": [
-                "PathComponent",
-                "RepositoryUrl"
+                "Column"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::CustomResource": {
+        "AWS::Cassandra::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "ColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "ColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.EncryptionSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKeyIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27674,18 +29615,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ServiceToken": {
-                            "type": "string"
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
                         }
                     },
                     "required": [
-                        "ServiceToken"
+                        "ExpiryEventsConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::CustomResource"
+                        "AWS::CertificateManager::Account"
                     ],
                     "type": "string"
                 },
@@ -27704,7 +29645,16 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookDefaultVersion": {
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27739,21 +29689,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "CertificateAuthorityArn": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "CertificateTransparencyLoggingPreference": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DomainName"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookDefaultVersion"
+                        "AWS::CertificateManager::Certificate"
                     ],
                     "type": "string"
                 },
@@ -27767,11 +29744,30 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookTypeConfig": {
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27806,27 +29802,58 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "ConfigurationAlias": {
-                            "type": "string"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "TypeArn": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
                             "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Configuration"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TeamsChannelId": {
+                            "type": "string"
+                        },
+                        "TeamsTenantId": {
+                            "type": "string"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "TeamId",
+                        "TeamsChannelId",
+                        "TeamsTenantId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookTypeConfig"
+                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27845,7 +29872,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion": {
+        "AWS::Chatbot::SlackChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27880,28 +29907,54 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "SchemaHandlerPackage": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
                             "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookVersion"
+                        "AWS::Chatbot::SlackChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27920,19 +29973,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion.LoggingConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "LogGroupName": {
-                    "type": "string"
-                },
-                "LogRoleArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFormation::Macro": {
+        "AWS::CleanRooms::AnalysisTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27967,31 +30008,45 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "AnalysisParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
+                            },
+                            "type": "array"
                         },
-                        "FunctionName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "LogGroupName": {
+                        "Format": {
                             "type": "string"
                         },
-                        "LogRoleARN": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "FunctionName",
-                        "Name"
+                        "Format",
+                        "MembershipIdentifier",
+                        "Name",
+                        "Source"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Macro"
+                        "AWS::CleanRooms::AnalysisTemplate"
                     ],
                     "type": "string"
                 },
@@ -28010,7 +30065,53 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleDefaultVersion": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferencedTables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ReferencedTables"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28045,21 +30146,56 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "CreatorDisplayName": {
                             "type": "string"
                         },
-                        "ModuleName": {
+                        "CreatorMemberAbilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CreatorPaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                        },
+                        "DataEncryptionMetadata": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "CreatorDisplayName",
+                        "CreatorMemberAbilities",
+                        "Description",
+                        "Members",
+                        "Name",
+                        "QueryLogStatus"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleDefaultVersion"
+                        "AWS::CleanRooms::Collaboration"
                     ],
                     "type": "string"
                 },
@@ -28073,11 +30209,86 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleVersion": {
+        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCleartext": {
+                    "type": "boolean"
+                },
+                "AllowDuplicates": {
+                    "type": "boolean"
+                },
+                "AllowJoinsOnColumnsWithDifferentNames": {
+                    "type": "boolean"
+                },
+                "PreserveNulls": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowCleartext",
+                "AllowDuplicates",
+                "AllowJoinsOnColumnsWithDifferentNames",
+                "PreserveNulls"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "MemberAbilities": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PaymentConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                }
+            },
+            "required": [
+                "AccountId",
+                "DisplayName",
+                "MemberAbilities"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28112,22 +30323,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ModuleName": {
+                        "AllowedColumns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalysisMethod": {
                             "type": "string"
                         },
-                        "ModulePackage": {
+                        "AnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "TableReference": {
+                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ModuleName",
-                        "ModulePackage"
+                        "AllowedColumns",
+                        "AnalysisMethod",
+                        "Name",
+                        "TableReference"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleVersion"
+                        "AWS::CleanRooms::ConfiguredTable"
                     ],
                     "type": "string"
                 },
@@ -28146,7 +30383,263 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::PublicTypeVersion": {
+        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnNames",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Minimum": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Minimum",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AggregateColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
+                    },
+                    "type": "array"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DimensionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinRequired": {
+                    "type": "string"
+                },
+                "OutputConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                    },
+                    "type": "array"
+                },
+                "ScalarFunctions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AggregateColumns",
+                "DimensionColumns",
+                "JoinColumns",
+                "OutputConstraints",
+                "ScalarFunctions"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedAnalysisProviders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DifferentialPrivacy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                },
+                "DisallowedOutputColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AllowedAnalyses"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ListColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "JoinColumns",
+                "ListColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.TableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Glue": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
+                }
+            },
+            "required": [
+                "Glue"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28181,27 +30674,45 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "ConfiguredTableAssociationAnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "ConfiguredTableIdentifier": {
                             "type": "string"
                         },
-                        "LogDeliveryBucket": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicVersionNumber": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ConfiguredTableIdentifier",
+                        "MembershipIdentifier",
+                        "Name",
+                        "RoleArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::PublicTypeVersion"
+                        "AWS::CleanRooms::ConfiguredTableAssociation"
                     ],
                     "type": "string"
                 },
@@ -28215,11 +30726,109 @@
                 }
             },
             "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::Publisher": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28254,21 +30863,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AcceptTermsAndConditions": {
-                            "type": "boolean"
+                        "Description": {
+                            "type": "string"
                         },
-                        "ConnectionArn": {
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "AcceptTermsAndConditions"
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Publisher"
+                        "AWS::CleanRooms::IdMappingTable"
                     ],
                     "type": "string"
                 },
@@ -28287,7 +30913,54 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceDefaultVersion": {
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingTableInputSource": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "IdMappingTableInputSource"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "IdNamespaceAssociationId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdNamespaceAssociationId",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28322,21 +30995,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "IdMappingConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig"
+                        },
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig"
+                        },
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceDefaultVersion"
+                        "AWS::CleanRooms::IdNamespaceAssociation"
                     ],
                     "type": "string"
                 },
@@ -28350,11 +31040,55 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion": {
+        "AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowUseAsDimensionColumn": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowUseAsDimensionColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingWorkflowsSupported": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "IdNamespaceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28389,28 +31123,34 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "CollaborationIdentifier": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        "DefaultResultConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
                         },
-                        "SchemaHandlerPackage": {
-                            "type": "string"
+                        "PaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
                         },
-                        "TypeName": {
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "CollaborationIdentifier",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceVersion"
+                        "AWS::CleanRooms::Membership"
                     ],
                     "type": "string"
                 },
@@ -28429,19 +31169,77 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OutputConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "ResultFormat": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Bucket",
+                "ResultFormat"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::Stack": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28476,42 +31274,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "NotificationARNs": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "AutoRefresh": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
                         },
                         "Parameters": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
+                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        },
+                        "PrivacyBudgetType": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
-                        },
-                        "TimeoutInMinutes": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "TemplateURL"
+                        "AutoRefresh",
+                        "MembershipIdentifier",
+                        "Parameters",
+                        "PrivacyBudgetType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Stack"
+                        "AWS::CleanRooms::PrivacyBudgetTemplate"
                     ],
                     "type": "string"
                 },
@@ -28530,7 +31322,23 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Epsilon": {
+                    "type": "number"
+                },
+                "UsersNoisePerQuery": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Epsilon",
+                "UsersNoisePerQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRoomsML::TrainingDataset": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28565,73 +31373,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdministrationRoleARN": {
-                            "type": "string"
-                        },
-                        "AutoDeployment": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
-                        },
-                        "CallAs": {
-                            "type": "string"
-                        },
-                        "Capabilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "ExecutionRoleName": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ManagedExecution": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
-                        },
-                        "OperationPreferences": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
-                        },
-                        "Parameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                            },
-                            "type": "array"
-                        },
-                        "PermissionModel": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "StackInstancesGroup": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
                         },
-                        "StackSetName": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "TrainingData": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
                             },
                             "type": "array"
-                        },
-                        "TemplateBody": {
-                            "type": "string"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "PermissionModel",
-                        "StackSetName"
+                        "Name",
+                        "RoleArn",
+                        "TrainingData"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::StackSet"
+                        "AWS::CleanRoomsML::TrainingDataset"
                     ],
                     "type": "string"
                 },
@@ -28650,120 +31423,92 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.AutoDeployment": {
+        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "ColumnName": {
+                    "type": "string"
                 },
-                "RetainStacksOnAccountRemoval": {
-                    "type": "boolean"
+                "ColumnTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "ColumnTypes"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
             "additionalProperties": false,
             "properties": {
-                "AccountFilterType": {
-                    "type": "string"
-                },
-                "Accounts": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AccountsUrl": {
-                    "type": "string"
-                },
-                "OrganizationalUnitIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "GlueDataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
                 }
             },
+            "required": [
+                "GlueDataSource"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.ManagedExecution": {
+        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
             "additionalProperties": false,
             "properties": {
-                "Active": {
-                    "type": "boolean"
+                "InputConfig": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "InputConfig",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.OperationPreferences": {
+        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
             "additionalProperties": false,
             "properties": {
-                "FailureToleranceCount": {
-                    "type": "number"
-                },
-                "FailureTolerancePercentage": {
-                    "type": "number"
-                },
-                "MaxConcurrentCount": {
-                    "type": "number"
-                },
-                "MaxConcurrentPercentage": {
-                    "type": "number"
-                },
-                "RegionConcurrencyType": {
-                    "type": "string"
+                "DataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
                 },
-                "RegionOrder": {
+                "Schema": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
                     },
                     "type": "array"
                 }
             },
-            "type": "object"
-        },
-        "AWS::CloudFormation::StackSet.Parameter": {
-            "additionalProperties": false,
-            "properties": {
-                "ParameterKey": {
-                    "type": "string"
-                },
-                "ParameterValue": {
-                    "type": "string"
-                }
-            },
             "required": [
-                "ParameterKey",
-                "ParameterValue"
+                "DataSource",
+                "Schema"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.StackInstances": {
+        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
             "additionalProperties": false,
             "properties": {
-                "DeploymentTargets": {
-                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                "CatalogId": {
+                    "type": "string"
                 },
-                "ParameterOverrides": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                    },
-                    "type": "array"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Regions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "TableName": {
+                    "type": "string"
                 }
             },
             "required": [
-                "DeploymentTargets",
-                "Regions"
+                "DatabaseName",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation": {
+        "AWS::Cloud9::EnvironmentEC2": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28798,42 +31543,52 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoUpdate": {
-                            "type": "boolean"
+                        "AutomaticStopTimeMinutes": {
+                            "type": "number"
                         },
-                        "ExecutionRoleArn": {
+                        "ConnectionType": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
-                        },
-                        "MajorVersion": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicTypeArn": {
+                        "ImageId": {
                             "type": "string"
                         },
-                        "PublisherId": {
+                        "InstanceType": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "OwnerArn": {
                             "type": "string"
                         },
-                        "TypeNameAlias": {
-                            "type": "string"
+                        "Repositories": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                            },
+                            "type": "array"
                         },
-                        "VersionBump": {
+                        "SubnetId": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::TypeActivation"
+                        "AWS::Cloud9::EnvironmentEC2"
                     ],
                     "type": "string"
                 },
@@ -28847,31 +31602,33 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "PathComponent": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "RepositoryUrl": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitCondition": {
+        "AWS::CloudFormation::CustomResource": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
-                "CreationPolicy": {
-                    "type": "object"
-                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -28901,21 +31658,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Count": {
+                        "ServiceTimeout": {
                             "type": "number"
                         },
-                        "Handle": {
-                            "type": "string"
-                        },
-                        "Timeout": {
+                        "ServiceToken": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ServiceToken"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitCondition"
+                        "AWS::CloudFormation::CustomResource"
                     ],
                     "type": "string"
                 },
@@ -28929,11 +31686,12 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitConditionHandle": {
+        "AWS::CloudFormation::HookDefaultVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28967,12 +31725,22 @@
                 },
                 "Properties": {
                     "additionalProperties": false,
-                    "properties": {},
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitConditionHandle"
+                        "AWS::CloudFormation::HookDefaultVersion"
                     ],
                     "type": "string"
                 },
@@ -28990,7 +31758,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy": {
+        "AWS::CloudFormation::HookTypeConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29025,18 +31793,27 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CachePolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "ConfigurationAlias": {
+                            "type": "string"
+                        },
+                        "TypeArn": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CachePolicyConfig"
+                        "Configuration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CachePolicy"
+                        "AWS::CloudFormation::HookTypeConfig"
                     ],
                     "type": "string"
                 },
@@ -29055,119 +31832,239 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+        "AWS::CloudFormation::HookVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "Condition": {
                     "type": "string"
                 },
-                "DefaultTTL": {
-                    "type": "number"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "MaxTTL": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "MinTTL": {
-                    "type": "number"
+                "Metadata": {
+                    "type": "object"
                 },
-                "Name": {
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookVersion"
+                    ],
                     "type": "string"
                 },
-                "ParametersInCacheKeyAndForwardedToOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "DefaultTTL",
-                "MaxTTL",
-                "MinTTL",
-                "Name",
-                "ParametersInCacheKeyAndForwardedToOrigin"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+        "AWS::CloudFormation::HookVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "CookieBehavior": {
+                "LogGroupName": {
                     "type": "string"
                 },
-                "Cookies": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "CookieBehavior"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+        "AWS::CloudFormation::Macro": {
             "additionalProperties": false,
             "properties": {
-                "HeaderBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "HeaderBehavior"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
-            "additionalProperties": false,
-            "properties": {
-                "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "EnableAcceptEncodingBrotli": {
-                    "type": "boolean"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "EnableAcceptEncodingGzip": {
-                    "type": "boolean"
+                "Metadata": {
+                    "type": "object"
                 },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
                 },
-                "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "CookiesConfig",
-                "EnableAcceptEncodingGzip",
-                "HeadersConfig",
-                "QueryStringsConfig"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+        "AWS::CloudFormation::ModuleDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "QueryStringBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "QueryStrings": {
-                    "items": {
-                        "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "QueryStringBehavior"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+        "AWS::CloudFormation::ModuleVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29202,18 +32099,22 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CloudFrontOriginAccessIdentityConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName",
+                        "ModulePackage"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        "AWS::CloudFormation::ModuleVersion"
                     ],
                     "type": "string"
                 },
@@ -29232,19 +32133,80 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+        "AWS::CloudFormation::PublicTypeVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "LogDeliveryBucket": {
+                            "type": "string"
+                        },
+                        "PublicVersionNumber": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::PublicTypeVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Comment"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+        "AWS::CloudFormation::Publisher": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29279,18 +32241,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContinuousDeploymentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                        "AWS::CloudFormation::Publisher"
                     ],
                     "type": "string"
                 },
@@ -29309,134 +32274,250 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+        "AWS::CloudFormation::ResourceDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "Condition": {
+                    "type": "string"
                 },
-                "SingleHeaderPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "StagingDistributionDnsNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TrafficConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Enabled",
-                "StagingDistributionDnsNames"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IdleTTL": {
-                    "type": "number"
                 },
-                "MaximumTTL": {
-                    "type": "number"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "IdleTTL",
-                "MaximumTTL"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+        "AWS::CloudFormation::ResourceVersion": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "Condition": {
                     "type": "string"
                 },
-                "Value": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Header",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Header": {
+                },
+                "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": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceVersion"
+                    ],
                     "type": "string"
                 },
-                "Value": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "LogGroupName": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "Weight"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+        "AWS::CloudFormation::Stack": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "Condition": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Weight"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "SingleHeaderConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                "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": {
+                        "NotificationARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "TemplateURL"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution": {
+        "AWS::CloudFormation::StackSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29471,24 +32552,73 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        "AdministrationRoleARN": {
+                            "type": "string"
+                        },
+                        "AutoDeployment": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
+                        },
+                        "CallAs": {
+                            "type": "string"
+                        },
+                        "Capabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleName": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
+                        },
+                        "OperationPreferences": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionModel": {
+                            "type": "string"
+                        },
+                        "StackInstancesGroup": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                            },
+                            "type": "array"
+                        },
+                        "StackSetName": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DistributionConfig"
+                        "PermissionModel",
+                        "StackSetName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Distribution"
+                        "AWS::CloudFormation::StackSet"
                     ],
                     "type": "string"
                 },
@@ -29507,142 +32637,1002 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CacheBehavior": {
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "CachePolicyId": {
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountFilterType": {
                     "type": "string"
                 },
-                "CachedMethods": {
+                "Accounts": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "AccountsUrl": {
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
-                },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
-                },
-                "LambdaFunctionAssociations": {
+                "OrganizationalUnitIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                        "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.ManagedExecution": {
+            "additionalProperties": false,
+            "properties": {
+                "Active": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrencyMode": {
+                    "type": "string"
                 },
-                "MaxTTL": {
+                "FailureToleranceCount": {
                     "type": "number"
                 },
-                "MinTTL": {
+                "FailureTolerancePercentage": {
                     "type": "number"
                 },
-                "OriginRequestPolicyId": {
-                    "type": "string"
-                },
-                "PathPattern": {
-                    "type": "string"
-                },
-                "RealtimeLogConfigArn": {
-                    "type": "string"
-                },
-                "ResponseHeadersPolicyId": {
-                    "type": "string"
+                "MaxConcurrentCount": {
+                    "type": "number"
                 },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                "MaxConcurrentPercentage": {
+                    "type": "number"
                 },
-                "TargetOriginId": {
+                "RegionConcurrencyType": {
                     "type": "string"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TrustedSigners": {
+                "RegionOrder": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
-                },
-                "ViewerProtocolPolicy": {
-                    "type": "string"
                 }
             },
-            "required": [
-                "PathPattern",
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Cookies": {
+        "AWS::CloudFormation::StackSet.Parameter": {
             "additionalProperties": false,
             "properties": {
-                "Forward": {
+                "ParameterKey": {
                     "type": "string"
                 },
-                "WhitelistedNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ParameterValue": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Forward"
+                "ParameterKey",
+                "ParameterValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+        "AWS::CloudFormation::StackSet.StackInstances": {
             "additionalProperties": false,
             "properties": {
-                "ErrorCachingMinTTL": {
-                    "type": "number"
-                },
-                "ErrorCode": {
-                    "type": "number"
+                "DeploymentTargets": {
+                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
                 },
-                "ResponseCode": {
-                    "type": "number"
+                "ParameterOverrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                    },
+                    "type": "array"
                 },
-                "ResponsePagePath": {
-                    "type": "string"
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "ErrorCode"
+                "DeploymentTargets",
+                "Regions"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+        "AWS::CloudFormation::TypeActivation": {
             "additionalProperties": false,
             "properties": {
-                "HTTPPort": {
-                    "type": "number"
+                "Condition": {
+                    "type": "string"
                 },
-                "HTTPSPort": {
-                    "type": "number"
+                "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": {
+                        "AutoUpdate": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
+                        },
+                        "MajorVersion": {
+                            "type": "string"
+                        },
+                        "PublicTypeArn": {
+                            "type": "string"
+                        },
+                        "PublisherId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeNameAlias": {
+                            "type": "string"
+                        },
+                        "VersionBump": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::TypeActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "CreationPolicy": {
+                    "type": "object"
+                },
+                "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": {
+                        "Count": {
+                            "type": "number"
+                        },
+                        "Handle": {
+                            "type": "string"
+                        },
+                        "Timeout": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitCondition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitConditionHandle": {
+            "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": {},
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitConditionHandle"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy": {
+            "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": {
+                        "CachePolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "CachePolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CachePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ParametersInCacheKeyAndForwardedToOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                }
+            },
+            "required": [
+                "DefaultTTL",
+                "MaxTTL",
+                "MinTTL",
+                "Name",
+                "ParametersInCacheKeyAndForwardedToOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
+            "additionalProperties": false,
+            "properties": {
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                },
+                "EnableAcceptEncodingBrotli": {
+                    "type": "boolean"
+                },
+                "EnableAcceptEncodingGzip": {
+                    "type": "boolean"
+                },
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                },
+                "QueryStringsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                }
+            },
+            "required": [
+                "CookiesConfig",
+                "EnableAcceptEncodingGzip",
+                "HeadersConfig",
+                "QueryStringsConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+            "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": {
+                        "CloudFrontOriginAccessIdentityConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        }
+                    },
+                    "required": [
+                        "CloudFrontOriginAccessIdentityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+            "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": {
+                        "ContinuousDeploymentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ContinuousDeploymentPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SingleHeaderPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                },
+                "SingleWeightPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                },
+                "StagingDistributionDnsNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrafficConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "StagingDistributionDnsNames"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTTL": {
+                    "type": "number"
+                },
+                "MaximumTTL": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTTL",
+                "MaximumTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SingleHeaderConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                },
+                "SingleWeightConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution": {
+            "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": {
+                        "DistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DistributionConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Distribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CacheBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "PathPattern": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathPattern",
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Cookies": {
+            "additionalProperties": false,
+            "properties": {
+                "Forward": {
+                    "type": "string"
+                },
+                "WhitelistedNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Forward"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorCachingMinTTL": {
+                    "type": "number"
+                },
+                "ErrorCode": {
+                    "type": "number"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponsePagePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ErrorCode"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HTTPPort": {
+                    "type": "number"
+                },
+                "HTTPSPort": {
+                    "type": "number"
                 },
                 "OriginKeepaliveTimeout": {
                     "type": "number"
@@ -33408,9 +37398,21 @@
                         "EnvironmentType": {
                             "type": "string"
                         },
+                        "FleetServiceRole": {
+                            "type": "string"
+                        },
+                        "FleetVpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Fleet.VpcConfig"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "OverflowBehavior": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -33440,6 +37442,27 @@
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodeBuild::Project": {
             "additionalProperties": false,
             "properties": {
@@ -33867,6 +37890,9 @@
                     },
                     "type": "array"
                 },
+                "ScopeConfiguration": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.ScopeConfiguration"
+                },
                 "Webhook": {
                     "type": "boolean"
                 }
@@ -33907,6 +37933,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Project.ScopeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
         "AWS::CodeBuild::Project.Source": {
             "additionalProperties": false,
             "properties": {
@@ -35752,6 +39790,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.BeforeEntryConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35768,6 +39818,21 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Result": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleDeclaration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.EncryptionKey": {
             "additionalProperties": false,
             "properties": {
@@ -35784,6 +39849,21 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.FailureConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                },
+                "Result": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.GitBranchFilterCriteria": {
             "additionalProperties": false,
             "properties": {
@@ -35934,6 +40014,51 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.RuleDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RuleTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleTypeId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.RuleTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.StageDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35943,6 +40068,9 @@
                     },
                     "type": "array"
                 },
+                "BeforeEntry": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BeforeEntryConditions"
+                },
                 "Blockers": {
                     "items": {
                         "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
@@ -35951,6 +40079,12 @@
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.FailureConditions"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.SuccessConditions"
                 }
             },
             "required": [
@@ -35975,6 +40109,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.SuccessConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.VariableDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36665,6 +40811,12 @@
                         "IdentityPoolName": {
                             "type": "string"
                         },
+                        "IdentityPoolTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "OpenIdConnectProviderARNs": {
                             "items": {
                                 "type": "string"
@@ -37057,6 +41209,15 @@
             },
             "type": "object"
         },
+        "AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::LogDeliveryConfiguration.LogConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -37066,8 +41227,23 @@
                 "EventSource": {
                     "type": "string"
                 },
+                "FirehoseConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration"
+                },
                 "LogLevel": {
                     "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.S3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::LogDeliveryConfiguration.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -37131,6 +41307,12 @@
                         "DeviceConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
                         },
+                        "EmailAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "EmailAuthenticationSubject": {
+                            "type": "string"
+                        },
                         "EmailConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
                         },
@@ -37250,6 +41432,15 @@
             },
             "type": "object"
         },
+        "AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomAuthMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::UserPool.CustomEmailSender": {
             "additionalProperties": false,
             "properties": {
@@ -37388,6 +41579,9 @@
                 "MinimumLength": {
                     "type": "number"
                 },
+                "PasswordHistorySize": {
+                    "type": "number"
+                },
                 "RequireLowercase": {
                     "type": "boolean"
                 },
@@ -37511,6 +41705,9 @@
         "AWS::Cognito::UserPool.UserPoolAddOns": {
             "additionalProperties": false,
             "properties": {
+                "AdvancedSecurityAdditionalFlows": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows"
+                },
                 "AdvancedSecurityMode": {
                     "type": "string"
                 }
@@ -40263,6 +44460,97 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::AgentStatus": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayOrder": {
+                            "type": "number"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResetOrderNumber": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "State"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::AgentStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::ApprovedOrigin": {
             "additionalProperties": false,
             "properties": {
@@ -42149,6 +46437,12 @@
                     },
                     "type": "array"
                 },
+                "SubmitAutoEvaluationActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Connect::Rule.SubmitAutoEvaluationAction"
+                    },
+                    "type": "array"
+                },
                 "TaskActions": {
                     "items": {
                         "$ref": "#/definitions/AWS::Connect::Rule.TaskAction"
@@ -42308,6 +46602,18 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::Rule.SubmitAutoEvaluationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EvaluationFormArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EvaluationFormArn"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::Rule.TaskAction": {
             "additionalProperties": false,
             "properties": {
@@ -43090,6 +47396,185 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::UserHierarchyStructure": {
+            "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": {
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "UserHierarchyStructure": {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.UserHierarchyStructure"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyStructure"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFive": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFour": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelOne": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelThree": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelTwo": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.UserHierarchyStructure": {
+            "additionalProperties": false,
+            "properties": {
+                "LevelFive": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFive"
+                },
+                "LevelFour": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFour"
+                },
+                "LevelOne": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelOne"
+                },
+                "LevelThree": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelThree"
+                },
+                "LevelTwo": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelTwo"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Connect::View": {
             "additionalProperties": false,
             "properties": {
@@ -47265,9 +51750,6 @@
                         "ComputeConfig": {
                             "$ref": "#/definitions/AWS::DMS::ReplicationConfig.ComputeConfig"
                         },
-                        "ReplicationConfigArn": {
-                            "type": "string"
-                        },
                         "ReplicationConfigIdentifier": {
                             "type": "string"
                         },
@@ -47299,6 +51781,14 @@
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ComputeConfig",
+                        "ReplicationConfigIdentifier",
+                        "ReplicationType",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -47317,7 +51807,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -47416,6 +51907,9 @@
                         "MultiAZ": {
                             "type": "boolean"
                         },
+                        "NetworkType": {
+                            "type": "string"
+                        },
                         "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
@@ -51683,9 +56177,18 @@
                         "DomainIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentAccountIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentAccountRegion": {
+                            "type": "string"
+                        },
                         "EnvironmentProfileIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentRoleArn": {
+                            "type": "string"
+                        },
                         "GlossaryTerms": {
                             "items": {
                                 "type": "string"
@@ -51707,7 +56210,6 @@
                     },
                     "required": [
                         "DomainIdentifier",
-                        "EnvironmentProfileIdentifier",
                         "Name",
                         "ProjectIdentifier"
                     ],
@@ -51746,6 +56248,95 @@
             },
             "type": "object"
         },
+        "AWS::DataZone::EnvironmentActions": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::EnvironmentActions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::EnvironmentBlueprintConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -51958,6 +56549,78 @@
             },
             "type": "object"
         },
+        "AWS::DataZone::GroupProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "GroupIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::GroupProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::DataZone::Project": {
             "additionalProperties": false,
             "properties": {
@@ -52036,6 +56699,95 @@
             ],
             "type": "object"
         },
+        "AWS::DataZone::ProjectMembership": {
+            "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": {
+                        "Designation": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Member": {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership.Member"
+                        },
+                        "ProjectIdentifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Designation",
+                        "DomainIdentifier",
+                        "Member",
+                        "ProjectIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::ProjectMembership"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::ProjectMembership.Member": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupIdentifier": {
+                    "type": "string"
+                },
+                "UserIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::SubscriptionTarget": {
             "additionalProperties": false,
             "properties": {
@@ -52157,6 +56909,117 @@
             ],
             "type": "object"
         },
+        "AWS::DataZone::UserProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserIdentifier": {
+                            "type": "string"
+                        },
+                        "UserType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "UserIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.IamUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.SsoUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.UserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.IamUserProfileDetails"
+                },
+                "Sso": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.SsoUserProfileDetails"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Deadline::Farm": {
             "additionalProperties": false,
             "properties": {
@@ -52200,6 +57063,12 @@
                         },
                         "KmsKeyArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -52283,11 +57152,18 @@
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
                         "Configuration",
                         "DisplayName",
+                        "FarmId",
                         "MaxWorkerCount",
                         "RoleArn"
                     ],
@@ -52650,6 +57526,12 @@
                             },
                             "type": "array"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "VpcId": {
                             "type": "string"
                         }
@@ -52717,27 +57599,94 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Family": {
+                        "LicenseEndpointId": {
                             "type": "string"
                         },
-                        "LicenseEndpointId": {
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Deadline::MeteredProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Deadline::Monitor": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "Port": {
-                            "type": "number"
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
                         },
-                        "ProductId": {
+                        "IdentityCenterInstanceArn": {
                             "type": "string"
                         },
-                        "Vendor": {
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Subdomain": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DisplayName",
+                        "IdentityCenterInstanceArn",
+                        "RoleArn",
+                        "Subdomain"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Deadline::MeteredProduct"
+                        "AWS::Deadline::Monitor"
                     ],
                     "type": "string"
                 },
@@ -52751,7 +57700,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -52822,10 +57772,17 @@
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DisplayName"
+                        "DisplayName",
+                        "FarmId"
                     ],
                     "type": "object"
                 },
@@ -53123,6 +58080,7 @@
                     },
                     "required": [
                         "DisplayName",
+                        "FarmId",
                         "OsFamily"
                     ],
                     "type": "object"
@@ -54542,6 +59500,9 @@
                         "TimeToLiveSpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
                         },
+                        "WriteOnDemandThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                        },
                         "WriteProvisionedThroughputSettings": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                         }
@@ -54640,6 +59601,9 @@
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
                 },
+                "WriteOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                },
                 "WriteProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                 }
@@ -54729,6 +59693,15 @@
             },
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54750,6 +59723,9 @@
                 "IndexName": {
                     "type": "string"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 }
@@ -54792,6 +59768,9 @@
                 "PointInTimeRecoverySpecification": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 },
@@ -54909,6 +59888,15 @@
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54992,6 +59980,9 @@
                             },
                             "type": "array"
                         },
+                        "OnDemandThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                        },
                         "PointInTimeRecoverySpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
                         },
@@ -55107,6 +60098,9 @@
                     },
                     "type": "array"
                 },
+                "OnDemandThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                },
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
                 },
@@ -55206,6 +60200,18 @@
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::Table.OnDemandThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                },
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
             "additionalProperties": false,
             "properties": {
@@ -56163,6 +61169,9 @@
                         "BgpAsn": {
                             "type": "number"
                         },
+                        "BgpAsnExtended": {
+                            "type": "number"
+                        },
                         "CertificateArn": {
                             "type": "string"
                         },
@@ -57429,6 +62438,9 @@
                         "Description": {
                             "type": "string"
                         },
+                        "EnablePrivateGua": {
+                            "type": "boolean"
+                        },
                         "OperatingRegions": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
@@ -58509,6 +63521,18 @@
             ],
             "type": "object"
         },
+        "AWS::EC2::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::Instance.Volume": {
             "additionalProperties": false,
             "properties": {
@@ -63185,12 +68209,6 @@
                         "Ipv6CidrBlock": {
                             "type": "string"
                         },
-                        "Ipv6CidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Ipv6IpamPoolId": {
                             "type": "string"
                         },
@@ -63604,6 +68622,12 @@
                         "SourcePortRange": {
                             "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "TrafficDirection": {
                             "type": "string"
                         },
@@ -63888,6 +68912,9 @@
                         "PropagationDefaultRouteTableId": {
                             "type": "string"
                         },
+                        "SecurityGroupReferencingSupport": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -64565,6 +69592,7 @@
                         }
                     },
                     "required": [
+                        "DestinationCidrBlock",
                         "TransitGatewayRouteTableId"
                     ],
                     "type": "object"
@@ -64907,6 +69935,9 @@
                 },
                 "Ipv6Support": {
                     "type": "string"
+                },
+                "SecurityGroupReferencingSupport": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -65668,6 +70699,24 @@
                         "CustomerGatewayId": {
                             "type": "string"
                         },
+                        "EnableAcceleration": {
+                            "type": "boolean"
+                        },
+                        "LocalIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "LocalIpv6NetworkCidr": {
+                            "type": "string"
+                        },
+                        "OutsideIpAddressType": {
+                            "type": "string"
+                        },
+                        "RemoteIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "RemoteIpv6NetworkCidr": {
+                            "type": "string"
+                        },
                         "StaticRoutesOnly": {
                             "type": "boolean"
                         },
@@ -65680,6 +70729,12 @@
                         "TransitGatewayId": {
                             "type": "string"
                         },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TunnelInsideIpVersion": {
+                            "type": "string"
+                        },
                         "Type": {
                             "type": "string"
                         },
@@ -67221,6 +72276,9 @@
                             },
                             "type": "array"
                         },
+                        "CustomRoleArn": {
+                            "type": "string"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -67515,6 +72573,9 @@
             "properties": {
                 "ExecuteCommandConfiguration": {
                     "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                },
+                "ManagedStorageConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ManagedStorageConfiguration"
                 }
             },
             "type": "object"
@@ -67567,113 +72628,125 @@
             },
             "type": "object"
         },
-        "AWS::ECS::Cluster.ServiceConnectDefaults": {
+        "AWS::ECS::Cluster.ManagedStorageConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Namespace": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::ECS::ClusterCapacityProviderAssociations": {
-            "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": {
-                        "CapacityProviders": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Cluster": {
-                            "type": "string"
-                        },
-                        "DefaultCapacityProviderStrategy": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "CapacityProviders",
-                        "Cluster",
-                        "DefaultCapacityProviderStrategy"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::ECS::ClusterCapacityProviderAssociations"
-                    ],
+                "FargateEphemeralStorageKmsKeyId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "KmsKeyId": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+        "AWS::ECS::Cluster.ServiceConnectDefaults": {
             "additionalProperties": false,
             "properties": {
-                "Base": {
-                    "type": "number"
-                },
-                "CapacityProvider": {
+                "Namespace": {
                     "type": "string"
-                },
-                "Weight": {
-                    "type": "number"
                 }
             },
-            "required": [
-                "CapacityProvider"
-            ],
             "type": "object"
         },
-        "AWS::ECS::PrimaryTaskSet": {
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "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": {
+                        "CapacityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CapacityProviders",
+                        "Cluster",
+                        "DefaultCapacityProviderStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::ClusterCapacityProviderAssociations"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::PrimaryTaskSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -68583,6 +73656,9 @@
                     },
                     "type": "array"
                 },
+                "RestartPolicy": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RestartPolicy"
+                },
                 "Secrets": {
                     "items": {
                         "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
@@ -69019,6 +74095,24 @@
             ],
             "type": "object"
         },
+        "AWS::ECS::TaskDefinition.RestartPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnoredExitCodes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "RestartAttemptPeriod": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::TaskDefinition.RuntimePlatform": {
             "additionalProperties": false,
             "properties": {
@@ -69919,6 +75013,12 @@
                         "ConfigurationValues": {
                             "type": "string"
                         },
+                        "PodIdentityAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Addon.PodIdentityAssociation"
+                            },
+                            "type": "array"
+                        },
                         "PreserveOnDelete": {
                             "type": "boolean"
                         },
@@ -69962,6 +75062,22 @@
             ],
             "type": "object"
         },
+        "AWS::EKS::Addon.PodIdentityAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceAccount"
+            ],
+            "type": "object"
+        },
         "AWS::EKS::Cluster": {
             "additionalProperties": false,
             "properties": {
@@ -70000,6 +75116,9 @@
                         "AccessConfig": {
                             "$ref": "#/definitions/AWS::EKS::Cluster.AccessConfig"
                         },
+                        "BootstrapSelfManagedAddons": {
+                            "type": "boolean"
+                        },
                         "EncryptionConfig": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
@@ -70030,8 +75149,14 @@
                             },
                             "type": "array"
                         },
+                        "UpgradePolicy": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.UpgradePolicy"
+                        },
                         "Version": {
                             "type": "string"
+                        },
+                        "ZonalShiftConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ZonalShiftConfig"
                         }
                     },
                     "required": [
@@ -70206,6 +75331,24 @@
             ],
             "type": "object"
         },
+        "AWS::EKS::Cluster.UpgradePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "SupportType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ZonalShiftConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EKS::FargateProfile": {
             "additionalProperties": false,
             "properties": {
@@ -71158,6 +76301,9 @@
                 "Name": {
                     "type": "string"
                 },
+                "ResizeSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetResizingSpecifications"
+                },
                 "TargetOnDemandCapacity": {
                     "type": "number"
                 },
@@ -71179,6 +76325,18 @@
             },
             "type": "object"
         },
+        "AWS::EMR::Cluster.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.InstanceGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71243,6 +76401,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71392,11 +76553,29 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71404,6 +76583,21 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.PlacementGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71555,6 +76749,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.StepConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71649,6 +76855,9 @@
                         "Name": {
                             "type": "string"
                         },
+                        "ResizeSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications"
+                        },
                         "TargetOnDemandCapacity": {
                             "type": "number"
                         },
@@ -71749,6 +76958,18 @@
             },
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71773,6 +76994,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71782,11 +77006,29 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71794,6 +77036,21 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -71816,6 +77073,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -72802,6 +78071,9 @@
                             },
                             "type": "array"
                         },
+                        "InteractiveConfiguration": {
+                            "$ref": "#/definitions/AWS::EMRServerless::Application.InteractiveConfiguration"
+                        },
                         "MaximumCapacity": {
                             "$ref": "#/definitions/AWS::EMRServerless::Application.MaximumAllowedResources"
                         },
@@ -72982,6 +78254,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMRServerless::Application.InteractiveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LivyEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "StudioEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMRServerless::Application.LogTypeMapKeyValuePair": {
             "additionalProperties": false,
             "properties": {
@@ -73086,6 +78370,9 @@
                 "Disk": {
                     "type": "string"
                 },
+                "DiskType": {
+                    "type": "string"
+                },
                 "Memory": {
                     "type": "string"
                 }
@@ -75267,6 +80554,12 @@
                             },
                             "type": "array"
                         },
+                        "ListenerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute"
+                            },
+                            "type": "array"
+                        },
                         "LoadBalancerArn": {
                             "type": "string"
                         },
@@ -75481,6 +80774,18 @@
             },
             "type": "object"
         },
+        "AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ElasticLoadBalancingV2::Listener.MutualAuthentication": {
             "additionalProperties": false,
             "properties": {
@@ -76944,6 +82249,31 @@
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "RecordMatchingModel": {
+                    "type": "string"
+                },
+                "RuleDefinitionType": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "RecordMatchingModel"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdMappingWorkflow.IdMappingTechniques": {
             "additionalProperties": false,
             "properties": {
@@ -76952,6 +82282,9 @@
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.ProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties"
                 }
             },
             "type": "object"
@@ -77025,6 +82358,25 @@
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdNamespace": {
             "additionalProperties": false,
             "properties": {
@@ -77126,6 +82478,9 @@
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties"
                 }
             },
             "required": [
@@ -77169,213 +82524,34 @@
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow": {
+        "AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "AttributeMatchingModel": {
                     "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
-                            },
-                            "type": "array"
-                        },
-                        "OutputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
-                            },
-                            "type": "array"
-                        },
-                        "ResolutionTechniques": {
-                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "WorkflowName": {
-                            "type": "string"
-                        }
+                "RecordMatchingModels": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "InputSourceConfig",
-                        "OutputSourceConfig",
-                        "ResolutionTechniques",
-                        "RoleArn",
-                        "WorkflowName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::EntityResolution::MatchingWorkflow"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "InputSourceARN": {
-                    "type": "string"
-                },
-                "SchemaArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputSourceARN",
-                "SchemaArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "IntermediateS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
-            "additionalProperties": false,
-            "properties": {
-                "Hashed": {
-                    "type": "boolean"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "KMSArn": {
-                    "type": "string"
+                    "type": "array"
                 },
-                "Output": {
+                "RuleDefinitionTypes": {
                     "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "OutputS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Output",
-                "OutputS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateSourceConfiguration": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
-                },
-                "ProviderConfiguration": {
-                    "additionalProperties": true,
-                    "patternProperties": {
-                        "^[a-zA-Z0-9]+$": {
-                            "type": "string"
-                        }
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.Rule"
                     },
-                    "type": "object"
-                },
-                "ProviderServiceArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ProviderServiceArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
-            "additionalProperties": false,
-            "properties": {
-                "ProviderProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
-                },
-                "ResolutionType": {
-                    "type": "string"
-                },
-                "RuleBasedProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                    "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+        "AWS::EntityResolution::IdNamespace.Rule": {
             "additionalProperties": false,
             "properties": {
                 "MatchingKeys": {
@@ -77394,26 +82570,269 @@
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "AttributeMatchingModel": {
-                    "type": "string"
-                },
-                "Rules": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AttributeMatchingModel",
-                "Rules"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::PolicyStatement": {
+        "AWS::EntityResolution::MatchingWorkflow": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IncrementalRunConfig": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig"
+                        },
+                        "InputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
+                            },
+                            "type": "array"
+                        },
+                        "OutputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
+                            },
+                            "type": "array"
+                        },
+                        "ResolutionTechniques": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputSourceConfig",
+                        "OutputSourceConfig",
+                        "ResolutionTechniques",
+                        "RoleArn",
+                        "WorkflowName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EntityResolution::MatchingWorkflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IncrementalRunType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IncrementalRunType"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "InputSourceARN": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSourceARN",
+                "SchemaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Hashed": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "KMSArn": {
+                    "type": "string"
+                },
+                "Output": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                    },
+                    "type": "array"
+                },
+                "OutputS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Output",
+                "OutputS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateSourceConfiguration": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
+                },
+                "ProviderConfiguration": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ProviderServiceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderServiceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
+                },
+                "ResolutionType": {
+                    "type": "string"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "MatchPurpose": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::PolicyStatement": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -77590,6 +83009,9 @@
                 "GroupName": {
                     "type": "string"
                 },
+                "Hashed": {
+                    "type": "boolean"
+                },
                 "MatchKey": {
                     "type": "string"
                 },
@@ -78514,9 +83936,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Events::EventBus.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
                         "EventSourceName": {
                             "type": "string"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -78556,6 +83987,15 @@
             ],
             "type": "object"
         },
+        "AWS::Events::EventBus.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Events::EventBusPolicy": {
             "additionalProperties": false,
             "properties": {
@@ -80531,80 +85971,95 @@
             },
             "type": "object"
         },
-        "AWS::FMS::Policy.NetworkFirewallPolicy": {
+        "AWS::FMS::Policy.IcmpTypeCode": {
             "additionalProperties": false,
             "properties": {
-                "FirewallDeploymentModel": {
-                    "type": "string"
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
                 }
             },
             "required": [
-                "FirewallDeploymentModel"
+                "Code",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyOption": {
+        "AWS::FMS::Policy.NetworkAclCommonPolicy": {
             "additionalProperties": false,
             "properties": {
-                "NetworkFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
-                },
-                "ThirdPartyFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                "NetworkAclEntrySet": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntrySet"
                 }
             },
+            "required": [
+                "NetworkAclEntrySet"
+            ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyTag": {
+        "AWS::FMS::Policy.NetworkAclEntry": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CidrBlock": {
                     "type": "string"
                 },
-                "Value": {
+                "Egress": {
+                    "type": "boolean"
+                },
+                "IcmpTypeCode": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.IcmpTypeCode"
+                },
+                "Ipv6CidrBlock": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::FMS::Policy.ResourceTag": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PortRange"
+                },
+                "Protocol": {
                     "type": "string"
                 },
-                "Value": {
+                "RuleAction": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key"
+                "Egress",
+                "Protocol",
+                "RuleAction"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.SecurityServicePolicyData": {
+        "AWS::FMS::Policy.NetworkAclEntrySet": {
             "additionalProperties": false,
             "properties": {
-                "ManagedServiceData": {
-                    "type": "string"
+                "FirstEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 },
-                "PolicyOption": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                "ForceRemediateForFirstEntries": {
+                    "type": "boolean"
                 },
-                "Type": {
-                    "type": "string"
+                "ForceRemediateForLastEntries": {
+                    "type": "boolean"
+                },
+                "LastEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Type"
+                "ForceRemediateForFirstEntries",
+                "ForceRemediateForLastEntries"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
+        "AWS::FMS::Policy.NetworkFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
                 "FirewallDeploymentModel": {
@@ -80616,224 +86071,316 @@
             ],
             "type": "object"
         },
-        "AWS::FMS::ResourceSet": {
+        "AWS::FMS::Policy.PolicyOption": {
             "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"
-                        }
-                    ]
+                "NetworkAclCommonPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclCommonPolicy"
                 },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ResourceTypeList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Resources": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "ResourceTypeList"
-                    ],
-                    "type": "object"
+                "NetworkFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::FMS::ResourceSet"
-                    ],
+                "ThirdPartyFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation": {
+        "AWS::FMS::Policy.PortRange": {
             "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": {
-                        "BatchImportMetaDataOnCreate": {
-                            "type": "boolean"
-                        },
-                        "DataRepositoryPath": {
-                            "type": "string"
-                        },
-                        "FileSystemId": {
-                            "type": "string"
-                        },
-                        "FileSystemPath": {
-                            "type": "string"
-                        },
-                        "ImportedFileChunkSize": {
-                            "type": "number"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DataRepositoryPath",
-                        "FileSystemId",
-                        "FileSystemPath"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::FSx::DataRepositoryAssociation"
-                    ],
-                    "type": "string"
+                "From": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "To": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "From",
+                "To"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+        "AWS::FMS::Policy.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+        "AWS::FMS::Policy.SecurityServicePolicyData": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ManagedServiceData": {
+                    "type": "string"
+                },
+                "PolicyOption": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.S3": {
+        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
-                "AutoExportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
-                },
-                "AutoImportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                "FirewallDeploymentModel": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "FirewallDeploymentModel"
+            ],
             "type": "object"
         },
-        "AWS::FSx::FileSystem": {
+        "AWS::FMS::ResourceSet": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ResourceTypeList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation": {
+            "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": {
+                        "BatchImportMetaDataOnCreate": {
+                            "type": "boolean"
+                        },
+                        "DataRepositoryPath": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "FileSystemPath": {
+                            "type": "string"
+                        },
+                        "ImportedFileChunkSize": {
+                            "type": "number"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataRepositoryPath",
+                        "FileSystemId",
+                        "FileSystemPath"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::DataRepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoExportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
+                },
+                "AutoImportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -81023,6 +86570,9 @@
                 "ImportedFileChunkSize": {
                     "type": "number"
                 },
+                "MetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.MetadataConfiguration"
+                },
                 "PerUnitStorageThroughput": {
                     "type": "number"
                 },
@@ -81032,6 +86582,18 @@
             },
             "type": "object"
         },
+        "AWS::FSx::FileSystem.MetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::FSx::FileSystem.NfsExports": {
             "additionalProperties": false,
             "properties": {
@@ -84810,6 +90372,9 @@
         "AWS::GlobalAccelerator::CrossAccountAttachment.Resource": {
             "additionalProperties": false,
             "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
                 "EndpointId": {
                     "type": "string"
                 },
@@ -84817,9 +90382,6 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "EndpointId"
-            ],
             "type": "object"
         },
         "AWS::GlobalAccelerator::EndpointGroup": {
@@ -85527,6 +91089,12 @@
                 "ConnectionName": {
                     "type": "string"
                 },
+                "EnableAdditionalMetadata": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "Exclusions": {
                     "items": {
                         "type": "string"
@@ -85977,6 +91545,9 @@
                         },
                         "DatabaseInput": {
                             "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -86259,9 +91830,18 @@
                         "GlueVersion": {
                             "type": "string"
                         },
+                        "JobMode": {
+                            "type": "string"
+                        },
+                        "JobRunQueuingEnabled": {
+                            "type": "boolean"
+                        },
                         "LogUri": {
                             "type": "string"
                         },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
                         "MaxCapacity": {
                             "type": "number"
                         },
@@ -87887,7 +93467,7 @@
             },
             "type": "object"
         },
-        "AWS::Glue::Workflow": {
+        "AWS::Glue::UsageProfile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -87922,27 +93502,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultRunProperties": {
-                            "type": "object"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ProfileConfiguration"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "MaxConcurrentRuns": {
-                            "type": "number"
-                        },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "type": "object"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Glue::Workflow"
+                        "AWS::Glue::UsageProfile"
                     ],
                     "type": "string"
                 },
@@ -87956,11 +93539,130 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Grafana::Workspace": {
+        "AWS::Glue::UsageProfile.ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::UsageProfile.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JobConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SessionConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "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": {
+                        "DefaultRunProperties": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentRuns": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Grafana::Workspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91731,7 +97433,9 @@
                         }
                     },
                     "required": [
-                        "FindingCriteria"
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name"
                     ],
                     "type": "object"
                 },
@@ -91941,7 +97645,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Master": {
+        "AWS::GuardDuty::MalwareProtectionPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91976,25 +97680,31 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DetectorId": {
-                            "type": "string"
+                        "Actions": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNActions"
                         },
-                        "InvitationId": {
-                            "type": "string"
+                        "ProtectedResource": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource"
                         },
-                        "MasterId": {
+                        "Role": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.TagItem"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DetectorId",
-                        "MasterId"
+                        "ProtectedResource",
+                        "Role"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Master"
+                        "AWS::GuardDuty::MalwareProtectionPlan"
                     ],
                     "type": "string"
                 },
@@ -92013,7 +97723,80 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Member": {
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNActions": {
+            "additionalProperties": false,
+            "properties": {
+                "Tagging": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNTagging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.S3Bucket"
+                }
+            },
+            "required": [
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNTagging": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.S3Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "ObjectPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92051,30 +97834,22 @@
                         "DetectorId": {
                             "type": "string"
                         },
-                        "DisableEmailNotification": {
-                            "type": "boolean"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "MemberId": {
-                            "type": "string"
-                        },
-                        "Message": {
+                        "InvitationId": {
                             "type": "string"
                         },
-                        "Status": {
+                        "MasterId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Email"
+                        "DetectorId",
+                        "MasterId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Member"
+                        "AWS::GuardDuty::Master"
                     ],
                     "type": "string"
                 },
@@ -92093,7 +97868,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet": {
+        "AWS::GuardDuty::Member": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92128,37 +97903,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Activate": {
-                            "type": "boolean"
-                        },
                         "DetectorId": {
                             "type": "string"
                         },
-                        "Format": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
                             "type": "string"
                         },
-                        "Location": {
+                        "MemberId": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Message": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
-                            },
-                            "type": "array"
+                        "Status": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "Location"
+                        "Email"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::ThreatIntelSet"
+                        "AWS::GuardDuty::Member"
                     ],
                     "type": "string"
                 },
@@ -92177,23 +97948,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::HealthImaging::Datastore": {
+        "AWS::GuardDuty::ThreatIntelSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92228,27 +97983,37 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DatastoreName": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
                             },
-                            "type": "object"
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Format",
+                        "Location"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::HealthImaging::Datastore"
+                        "AWS::GuardDuty::ThreatIntelSet"
                     ],
                     "type": "string"
                 },
@@ -92262,11 +98027,101 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::HealthLake::FHIRDatastore": {
+        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthImaging::Datastore": {
+            "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": {
+                        "DatastoreName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthImaging::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92883,9 +98738,6 @@
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "ThumbprintList"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -92904,8 +98756,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -94081,7 +99932,7 @@
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration": {
+        "AWS::IVS::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94116,36 +99967,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DestinationConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
-                        },
                         "Name": {
                             "type": "string"
                         },
-                        "RecordingReconnectWindowSeconds": {
-                            "type": "number"
-                        },
-                        "RenditionConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        "PublicKeyMaterial": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ThumbnailConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
-                    "required": [
-                        "DestinationConfiguration"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::RecordingConfiguration"
+                        "AWS::IVS::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -94159,69 +99998,11 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RenditionSelection": {
-                    "type": "string"
-                },
-                "Renditions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "BucketName": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "BucketName"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RecordingMode": {
-                    "type": "string"
-                },
-                "Resolution": {
-                    "type": "string"
-                },
-                "Storage": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TargetIntervalSeconds": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::Stage": {
+        "AWS::IVS::RecordingConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94256,21 +100037,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "RecordingReconnectWindowSeconds": {
+                            "type": "number"
+                        },
+                        "RenditionConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "ThumbnailConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::Stage"
+                        "AWS::IVS::RecordingConfiguration"
                     ],
                     "type": "string"
                 },
@@ -94284,85 +100080,36 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RenditionSelection": {
                     "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": {
-                        "Name": {
-                            "type": "string"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "Renditions": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "S3"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::IVS::StorageConfiguration"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "BucketName": {
@@ -94374,7 +100121,202 @@
             ],
             "type": "object"
         },
-        "AWS::IVS::StreamKey": {
+        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordingMode": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                },
+                "Storage": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetIntervalSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::Stage": {
+            "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": {
+                        "AutoParticipantRecordingConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::Stage.AutoParticipantRecordingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Stage.AutoParticipantRecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MediaTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StorageConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StorageConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -96809,6 +102751,12 @@
                             "$ref": "#/definitions/AWS::InspectorV2::CisScanConfiguration.CisTargets"
                         }
                     },
+                    "required": [
+                        "ScanName",
+                        "Schedule",
+                        "SecurityLevel",
+                        "Targets"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -96827,7 +102775,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -98490,9 +104439,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ApplicationProtocol": {
+                            "type": "string"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
                         "AuthorizerConfig": {
                             "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
                         },
+                        "ClientCertificateConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.ClientCertificateConfig"
+                        },
                         "DomainConfigurationName": {
                             "type": "string"
                         },
@@ -98561,6 +104519,15 @@
             },
             "type": "object"
         },
+        "AWS::IoT::DomainConfiguration.ClientCertificateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientCertificateCallbackArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::IoT::DomainConfiguration.ServerCertificateConfig": {
             "additionalProperties": false,
             "properties": {
@@ -104016,6 +109983,12 @@
                             },
                             "type": "array"
                         },
+                        "SignalsToFetch": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchInformation"
+                            },
+                            "type": "array"
+                        },
                         "SpoolingMode": {
                             "type": "string"
                         },
@@ -104033,7 +110006,6 @@
                         }
                     },
                     "required": [
-                        "Action",
                         "CollectionScheme",
                         "Name",
                         "SignalCatalogArn",
@@ -104095,9 +110067,28 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                },
+                "TriggerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression",
+                "TriggerMode"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.DataDestinationConfig": {
             "additionalProperties": false,
             "properties": {
+                "MqttTopicConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.MqttTopicConfig"
+                },
                 "S3Config": {
                     "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.S3Config"
                 },
@@ -104107,6 +110098,22 @@
             },
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.MqttTopicConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "MqttTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "MqttTopicArn"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.S3Config": {
             "additionalProperties": false,
             "properties": {
@@ -104128,6 +110135,44 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.SignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig"
+                },
+                "TimeBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTFleetWise::Campaign.SignalFetchInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConditionLanguageVersion": {
+                    "type": "number"
+                },
+                "FullyQualifiedName": {
+                    "type": "string"
+                },
+                "SignalFetchConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchConfig"
+                }
+            },
+            "required": [
+                "Actions",
+                "FullyQualifiedName",
+                "SignalFetchConfig"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.SignalInformation": {
             "additionalProperties": false,
             "properties": {
@@ -104158,6 +110203,18 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionFrequencyMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutionFrequencyMs"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.TimestreamConfig": {
             "additionalProperties": false,
             "properties": {
@@ -111035,6 +117092,75 @@
             ],
             "type": "object"
         },
+        "AWS::Kinesis::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "ResourcePolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kinesis::Stream": {
             "additionalProperties": false,
             "properties": {
@@ -111949,6 +118075,9 @@
                 "ApplicationSnapshotConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
                 },
+                "ApplicationSystemRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration"
+                },
                 "EnvironmentProperties": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
                 },
@@ -112009,6 +118138,18 @@
             ],
             "type": "object"
         },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RollbackEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "RollbackEnabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
             "additionalProperties": false,
             "properties": {
@@ -112971,6 +119112,9 @@
                         "HttpEndpointDestinationConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
                         },
+                        "IcebergDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration"
+                        },
                         "KinesisStreamSourceConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
                         },
@@ -113182,6 +119326,15 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113260,6 +119413,31 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDatabaseName": {
+                    "type": "string"
+                },
+                "DestinationTableName": {
+                    "type": "string"
+                },
+                "S3ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "UniqueKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DestinationDatabaseName",
+                "DestinationTableName"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.DocumentIdOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113500,6 +119678,9 @@
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
@@ -113523,6 +119704,47 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "DestinationTableConfigurationList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration"
+                    },
+                    "type": "array"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "s3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CatalogConfiguration",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -113569,6 +119791,9 @@
                 "MSKClusterARN": {
                     "type": "string"
                 },
+                "ReadFromTimestamp": {
+                    "type": "string"
+                },
                 "TopicName": {
                     "type": "string"
                 }
@@ -113755,6 +119980,9 @@
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "Username": {
                     "type": "string"
                 }
@@ -113762,10 +119990,8 @@
             "required": [
                 "ClusterJDBCURL",
                 "CopyCommand",
-                "Password",
                 "RoleARN",
-                "S3Configuration",
-                "Username"
+                "S3Configuration"
             ],
             "type": "object"
         },
@@ -113845,6 +120071,24 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecretARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.Serializer": {
             "additionalProperties": false,
             "properties": {
@@ -113857,12 +120101,27 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.SnowflakeDestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "AccountUrl": {
                     "type": "string"
                 },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints"
+                },
                 "CloudWatchLoggingOptions": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
                 },
@@ -113902,6 +120161,9 @@
                 "Schema": {
                     "type": "string"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "SnowflakeRoleConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeRoleConfiguration"
                 },
@@ -113918,12 +120180,10 @@
             "required": [
                 "AccountUrl",
                 "Database",
-                "PrivateKey",
                 "RoleARN",
                 "S3Configuration",
                 "Schema",
-                "Table",
-                "User"
+                "Table"
             ],
             "type": "object"
         },
@@ -114004,12 +120264,14 @@
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
                 "HECEndpoint",
                 "HECEndpointType",
-                "HECToken",
                 "S3Configuration"
             ],
             "type": "object"
@@ -115378,9 +121640,6 @@
                     "type": "array"
                 }
             },
-            "required": [
-                "AdditionalVersionWeights"
-            ],
             "type": "object"
         },
         "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
@@ -115454,6 +121713,12 @@
                         },
                         "Description": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -115691,6 +121956,9 @@
                             },
                             "type": "array"
                         },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
                         "MaximumBatchingWindowInSeconds": {
                             "type": "number"
                         },
@@ -115730,6 +121998,12 @@
                         "StartingPositionTimestamp": {
                             "type": "number"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "Topics": {
                             "items": {
                                 "type": "string"
@@ -115972,6 +122246,9 @@
                         "PackageType": {
                             "type": "string"
                         },
+                        "RecursiveLoop": {
+                            "type": "string"
+                        },
                         "ReservedConcurrentExecutions": {
                             "type": "number"
                         },
@@ -116045,6 +122322,9 @@
                 "S3ObjectVersion": {
                     "type": "string"
                 },
+                "SourceKMSKeyArn": {
+                    "type": "string"
+                },
                 "ZipFile": {
                     "type": "string"
                 }
@@ -116638,6 +122918,9 @@
                         "FunctionName": {
                             "type": "string"
                         },
+                        "Policy": {
+                            "type": "object"
+                        },
                         "ProvisionedConcurrencyConfig": {
                             "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
                         },
@@ -116698,6 +122981,110 @@
             ],
             "type": "object"
         },
+        "AWS::LaunchWizard::Deployment": {
+            "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": {
+                        "DeploymentPatternName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Specifications": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LaunchWizard::Deployment.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "WorkloadName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeploymentPatternName",
+                        "Name",
+                        "Specifications",
+                        "WorkloadName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LaunchWizard::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LaunchWizard::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
         "AWS::Lex::Bot": {
             "additionalProperties": false,
             "properties": {
@@ -124203,6 +130590,15 @@
             },
             "type": "object"
         },
+        "AWS::MSK::Replicator.ReplicationTopicNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MSK::Replicator.TopicReplication": {
             "additionalProperties": false,
             "properties": {
@@ -124218,6 +130614,9 @@
                 "StartingPosition": {
                     "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationStartingPosition"
                 },
+                "TopicNameConfiguration": {
+                    "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationTopicNameConfiguration"
+                },
                 "TopicsToExclude": {
                     "items": {
                         "type": "string"
@@ -124533,9 +130932,15 @@
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
                         },
+                        "MaxWebservers": {
+                            "type": "number"
+                        },
                         "MaxWorkers": {
                             "type": "number"
                         },
+                        "MinWebservers": {
+                            "type": "number"
+                        },
                         "MinWorkers": {
                             "type": "number"
                         },
@@ -125922,6 +132327,15 @@
                         "AvailabilityZone": {
                             "type": "string"
                         },
+                        "Maintenance": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Maintenance"
+                        },
+                        "MediaStreams": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStream"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -125930,6 +132344,15 @@
                         },
                         "SourceFailoverConfig": {
                             "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        },
+                        "SourceMonitoringConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.SourceMonitoringConfig"
+                        },
+                        "VpcInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.VpcInterface"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -126013,6 +132436,33 @@
             },
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.Fmtp": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelOrder": {
+                    "type": "string"
+                },
+                "Colorimetry": {
+                    "type": "string"
+                },
+                "ExactFramerate": {
+                    "type": "string"
+                },
+                "Par": {
+                    "type": "string"
+                },
+                "Range": {
+                    "type": "string"
+                },
+                "ScanMode": {
+                    "type": "string"
+                },
+                "Tcs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.GatewayBridgeSource": {
             "additionalProperties": false,
             "properties": {
@@ -126028,6 +132478,119 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.InputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Interface"
+                }
+            },
+            "required": [
+                "InputPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Maintenance": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceDay": {
+                    "type": "string"
+                },
+                "MaintenanceStartHour": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaintenanceDay",
+                "MaintenanceStartHour"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamAttributes"
+                },
+                "ClockRate": {
+                    "type": "number"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Fmt": {
+                    "type": "number"
+                },
+                "MediaStreamId": {
+                    "type": "number"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                },
+                "MediaStreamType": {
+                    "type": "string"
+                },
+                "VideoFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MediaStreamId",
+                "MediaStreamName",
+                "MediaStreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Fmtp": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Fmtp"
+                },
+                "Lang": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingName": {
+                    "type": "string"
+                },
+                "InputConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.InputConfiguration"
+                    },
+                    "type": "array"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.Source": {
             "additionalProperties": false,
             "properties": {
@@ -126055,6 +132618,15 @@
                 "MaxLatency": {
                     "type": "number"
                 },
+                "MaxSyncBuffer": {
+                    "type": "number"
+                },
+                "MediaStreamSourceConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamSourceConfiguration"
+                    },
+                    "type": "array"
+                },
                 "MinLatency": {
                     "type": "number"
                 },
@@ -126094,154 +132666,202 @@
             },
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.SourcePriority": {
+        "AWS::MediaConnect::Flow.SourceMonitoringConfig": {
             "additionalProperties": false,
             "properties": {
-                "PrimarySource": {
+                "ThumbnailState": {
                     "type": "string"
                 }
             },
             "required": [
-                "PrimarySource"
+                "ThumbnailState"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
+        "AWS::MediaConnect::Flow.SourcePriority": {
             "additionalProperties": false,
             "properties": {
-                "VpcInterfaceName": {
+                "PrimarySource": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PrimarySource"
+            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement": {
+        "AWS::MediaConnect::Flow.VpcInterface": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Name": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "NetworkInterfaceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "NetworkInterfaceType": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "RoleArn": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DataTransferSubscriberFeePercent": {
-                            "type": "number"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Encryption": {
-                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
-                        },
-                        "EntitlementStatus": {
-                            "type": "string"
-                        },
-                        "FlowArn": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Description",
-                        "FlowArn",
-                        "Name",
-                        "Subscribers"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::MediaConnect::FlowEntitlement"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "SubnetId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "RoleArn",
+                "SecurityGroupIds",
+                "SubnetId"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
-                "Algorithm": {
-                    "type": "string"
-                },
-                "ConstantInitializationVector": {
-                    "type": "string"
-                },
-                "DeviceId": {
-                    "type": "string"
-                },
-                "KeyType": {
-                    "type": "string"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "ResourceId": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                },
-                "SecretArn": {
-                    "type": "string"
-                },
-                "Url": {
+                "VpcInterfaceName": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Algorithm",
-                "RoleArn"
-            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowOutput": {
+        "AWS::MediaConnect::FlowEntitlement": {
+            "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": {
+                        "DataTransferSubscriberFeePercent": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
+                        },
+                        "EntitlementStatus": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "FlowArn",
+                        "Name",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowEntitlement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "DeviceId": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Algorithm",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -126297,12 +132917,21 @@
                         "MaxLatency": {
                             "type": "number"
                         },
+                        "MediaStreamOutputConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "MinLatency": {
                             "type": "number"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "OutputStatus": {
+                            "type": "string"
+                        },
                         "Port": {
                             "type": "number"
                         },
@@ -126349,6 +132978,41 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationIp": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Interface"
+                }
+            },
+            "required": [
+                "DestinationIp",
+                "DestinationPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.EncodingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFactor": {
+                    "type": "number"
+                },
+                "EncoderProfile": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionFactor"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -126371,6 +133035,43 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.DestinationConfiguration"
+                    },
+                    "type": "array"
+                },
+                "EncodingName": {
+                    "type": "string"
+                },
+                "EncodingParameters": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.EncodingParameters"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
@@ -127528,6 +134229,9 @@
             "properties": {
                 "AvailSettings": {
                     "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                },
+                "Scte35SegmentationScope": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -128454,6 +135158,9 @@
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "NumRefFrames": {
                     "type": "number"
                 },
@@ -128601,6 +135308,9 @@
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "MvOverPictureBoundaries": {
                     "type": "string"
                 },
@@ -130310,7 +137020,7 @@
             },
             "type": "object"
         },
-        "AWS::MediaLive::Input": {
+        "AWS::MediaLive::ChannelPlacementGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130345,57 +137055,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
-                            },
-                            "type": "array"
+                        "ClusterId": {
+                            "type": "string"
                         },
-                        "InputDevices": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
-                            },
-                            "type": "array"
+                        "Name": {
+                            "type": "string"
                         },
-                        "InputSecurityGroups": {
+                        "Nodes": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "MediaConnectFlows": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Sources": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                                "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup.Tags"
                             },
                             "type": "array"
-                        },
-                        "Tags": {
-                            "type": "object"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "Vpc": {
-                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
                         }
                     },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Input"
+                        "AWS::MediaLive::ChannelPlacementGroup"
                     ],
                     "type": "string"
                 },
@@ -130413,76 +137096,727 @@
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Input.InputDestinationRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "StreamName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputSourceRequest": {
+        "AWS::MediaLive::ChannelPlacementGroup.Tags": {
             "additionalProperties": false,
             "properties": {
-                "PasswordParam": {
-                    "type": "string"
-                },
-                "Url": {
+                "Key": {
                     "type": "string"
                 },
-                "Username": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputVpcRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "SecurityGroupIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "SubnetIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "FlowArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::InputSecurityGroup": {
+        "AWS::MediaLive::CloudWatchAlarmTemplate": {
+            "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": {
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetResourceType": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods",
+                        "GroupIdentifier",
+                        "MetricName",
+                        "Name",
+                        "Period",
+                        "Statistic",
+                        "TargetResourceType",
+                        "Threshold",
+                        "TreatMissingData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::CloudWatchAlarmTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster": {
+            "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": {
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster.ClusterNetworkSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Cluster.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.ClusterNetworkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRoute": {
+                    "type": "string"
+                },
+                "InterfaceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Cluster.InterfaceMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.InterfaceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalInterfaceName": {
+                    "type": "string"
+                },
+                "NetworkId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventTargets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget"
+                            },
+                            "type": "array"
+                        },
+                        "EventType": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "EventType",
+                        "GroupIdentifier",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "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": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "InputDevices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
+                            },
+                            "type": "array"
+                        },
+                        "InputSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MediaConnectFlows": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                            },
+                            "type": "array"
+                        },
+                        "SrtSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.SrtSettingsRequest"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDestinationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputVpcRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerDecryptionRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "PassphraseSecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerDecryptionRequest"
+                },
+                "MinimumLatency": {
+                    "type": "number"
+                },
+                "SrtListenerAddress": {
+                    "type": "string"
+                },
+                "SrtListenerPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtSettingsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SrtCallerSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerSourceRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130593,41 +137927,500 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
-                            },
-                            "type": "array"
-                        },
-                        "MultiplexSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "MultiplexSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZones",
+                        "MultiplexSettings",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntitlementArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexMediaConnectOutputDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumVideoBufferDelayMilliseconds": {
+                    "type": "number"
+                },
+                "TransportStreamBitrate": {
+                    "type": "number"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "TransportStreamReservedBitrate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TransportStreamBitrate",
+                "TransportStreamId"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram": {
+            "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": {
+                        "MultiplexId": {
+                            "type": "string"
+                        },
+                        "MultiplexProgramSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
+                        },
+                        "PacketIdentifiersMap": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        },
+                        "PipelineDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredChannelPipeline": {
+                            "type": "string"
+                        },
+                        "ProgramName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplexprogram"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbSubPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbTeletextPid": {
+                    "type": "number"
+                },
+                "EtvPlatformPid": {
+                    "type": "number"
+                },
+                "EtvSignalPid": {
+                    "type": "number"
+                },
+                "KlvDataPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "PcrPid": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "number"
+                },
+                "PrivateMetadataPid": {
+                    "type": "number"
+                },
+                "Scte27Pids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Scte35Pid": {
+                    "type": "number"
+                },
+                "TimedMetadataPid": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveChannelPipeline": {
+                    "type": "string"
+                },
+                "PipelineId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PreferredChannelPipeline": {
+                    "type": "string"
+                },
+                "ProgramNumber": {
+                    "type": "number"
+                },
+                "ServiceDescriptor": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
+                },
+                "VideoSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                }
+            },
+            "required": [
+                "ProgramNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumBitrate": {
+                    "type": "number"
+                },
+                "MinimumBitrate": {
+                    "type": "number"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantBitrate": {
+                    "type": "number"
+                },
+                "StatmuxSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network": {
+            "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": {
+                        "IpPools": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.IpPool"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Routes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Route"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpPools",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Network"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.IpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Route": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Gateway": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::SdiSource": {
+            "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": {
+                        "Mode": {
+                            "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                                "$ref": "#/definitions/AWS::MediaLive::SdiSource.Tags"
                             },
                             "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AvailabilityZones",
-                        "MultiplexSettings",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplex"
+                        "AWS::MediaLive::SdiSource"
                     ],
                     "type": "string"
                 },
@@ -130646,47 +138439,7 @@
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "EntitlementArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
-            "additionalProperties": false,
-            "properties": {
-                "MultiplexMediaConnectOutputDestinationSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumVideoBufferDelayMilliseconds": {
-                    "type": "number"
-                },
-                "TransportStreamBitrate": {
-                    "type": "number"
-                },
-                "TransportStreamId": {
-                    "type": "number"
-                },
-                "TransportStreamReservedBitrate": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "TransportStreamBitrate",
-                "TransportStreamId"
-            ],
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.Tags": {
+        "AWS::MediaLive::SdiSource.Tags": {
             "additionalProperties": false,
             "properties": {
                 "Key": {
@@ -130698,7 +138451,7 @@
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram": {
+        "AWS::MediaLive::SignalMap": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130733,36 +138486,49 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ChannelId": {
-                            "type": "string"
+                        "CloudWatchAlarmTemplateGroupIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "MultiplexId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MultiplexProgramSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
-                        },
-                        "PacketIdentifiersMap": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        "DiscoveryEntryPointArn": {
+                            "type": "string"
                         },
-                        "PipelineDetails": {
+                        "EventBridgeRuleTemplateGroupIdentifiers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "PreferredChannelPipeline": {
-                            "type": "string"
+                        "ForceRediscovery": {
+                            "type": "boolean"
                         },
-                        "ProgramName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
+                    "required": [
+                        "DiscoveryEntryPointArn",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplexprogram"
+                        "AWS::MediaLive::SignalMap"
                     ],
                     "type": "string"
                 },
@@ -130776,143 +138542,81 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+        "AWS::MediaLive::SignalMap.MediaResource": {
             "additionalProperties": false,
             "properties": {
-                "AudioPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbSubPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbTeletextPid": {
-                    "type": "number"
-                },
-                "EtvPlatformPid": {
-                    "type": "number"
-                },
-                "EtvSignalPid": {
-                    "type": "number"
-                },
-                "KlvDataPids": {
+                "Destinations": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
                 },
-                "PcrPid": {
-                    "type": "number"
-                },
-                "PmtPid": {
-                    "type": "number"
-                },
-                "PrivateMetadataPid": {
-                    "type": "number"
+                "Name": {
+                    "type": "string"
                 },
-                "Scte27Pids": {
+                "Sources": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
-                },
-                "Scte35Pid": {
-                    "type": "number"
-                },
-                "TimedMetadataPid": {
-                    "type": "number"
-                },
-                "VideoPid": {
-                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+        "AWS::MediaLive::SignalMap.MediaResourceNeighbor": {
             "additionalProperties": false,
             "properties": {
-                "ActiveChannelPipeline": {
+                "Arn": {
                     "type": "string"
                 },
-                "PipelineId": {
+                "Name": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Arn"
+            ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+        "AWS::MediaLive::SignalMap.MonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "ProviderName": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ServiceName": {
+                "ErrorMessage": {
+                    "type": "string"
+                },
+                "Status": {
                     "type": "string"
                 }
             },
             "required": [
-                "ProviderName",
-                "ServiceName"
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+        "AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "PreferredChannelPipeline": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ProgramNumber": {
-                    "type": "number"
-                },
-                "ServiceDescriptor": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
-                },
-                "VideoSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                "Status": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ProgramNumber"
+                "DetailsUri",
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumBitrate": {
-                    "type": "number"
-                },
-                "MinimumBitrate": {
-                    "type": "number"
-                },
-                "Priority": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "ConstantBitrate": {
-                    "type": "number"
-                },
-                "StatmuxSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
-                }
-            },
-            "type": "object"
-        },
         "AWS::MediaPackage::Asset": {
             "additionalProperties": false,
             "properties": {
@@ -132102,6 +139806,9 @@
                         "Description": {
                             "type": "string"
                         },
+                        "InputType": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -132339,9 +140046,18 @@
                         "ContainerType": {
                             "type": "string"
                         },
+                        "DashManifests": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Description": {
                             "type": "string"
                         },
+                        "ForceEndpointErrorConfiguration": {
+                            "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration"
+                        },
                         "HlsManifests": {
                             "items": {
                                 "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration"
@@ -132373,6 +140089,7 @@
                     "required": [
                         "ChannelGroupName",
                         "ChannelName",
+                        "ContainerType",
                         "OriginEndpointName"
                     ],
                     "type": "object"
@@ -132398,6 +140115,63 @@
             ],
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DrmSignaling": {
+                    "type": "string"
+                },
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.FilterConfiguration"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScteDash": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ScteDash"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming"
+                }
+            },
+            "required": [
+                "ManifestName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming": {
+            "additionalProperties": false,
+            "properties": {
+                "TimingMode": {
+                    "type": "string"
+                },
+                "TimingSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -132466,6 +140240,18 @@
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointErrorConditions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -132538,6 +140324,15 @@
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ScteDash": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkerDash": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.ScteHls": {
             "additionalProperties": false,
             "properties": {
@@ -133330,6 +141125,9 @@
         "AWS::MediaTailor::PlaybackConfiguration.AvailSuppression": {
             "additionalProperties": false,
             "properties": {
+                "FillPolicy": {
+                    "type": "string"
+                },
                 "Mode": {
                     "type": "string"
                 },
@@ -134183,102 +141981,312 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AssociatedRoles": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
-                            },
-                            "type": "array"
-                        },
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BackupRetentionPeriod": {
-                            "type": "number"
-                        },
-                        "CopyTagsToSnapshot": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBInstanceParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBPort": {
+                            "type": "number"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ServerlessScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBClusterParameterGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBInstance": {
+            "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": {
+                        "AllowMajorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBClusterParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBInstanceParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBPort": {
-                            "type": "number"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
-                        },
-                        "DeletionProtection": {
+                        "AutoMinorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "EnableCloudwatchLogsExports": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "EngineVersion": {
+                        "AvailabilityZone": {
                             "type": "string"
                         },
-                        "IamAuthEnabled": {
-                            "type": "boolean"
-                        },
-                        "KmsKeyId": {
+                        "DBClusterIdentifier": {
                             "type": "string"
                         },
-                        "PreferredBackupWindow": {
+                        "DBInstanceClass": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
+                        "DBInstanceIdentifier": {
                             "type": "string"
                         },
-                        "RestoreToTime": {
+                        "DBParameterGroupName": {
                             "type": "string"
                         },
-                        "RestoreType": {
+                        "DBSnapshotIdentifier": {
                             "type": "string"
                         },
-                        "ServerlessScalingConfiguration": {
-                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
-                        },
-                        "SnapshotIdentifier": {
+                        "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "SourceDBClusterIdentifier": {
+                        "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
-                        "StorageEncrypted": {
-                            "type": "boolean"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UseLatestRestorableTime": {
-                            "type": "boolean"
-                        },
-                        "VpcSecurityGroupIds": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBCluster"
+                        "AWS::Neptune::DBInstance"
                     ],
                     "type": "string"
                 },
@@ -134292,42 +142300,12 @@
                 }
             },
             "required": [
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.DBClusterRole": {
-            "additionalProperties": false,
-            "properties": {
-                "FeatureName": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RoleArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxCapacity": {
-                    "type": "number"
-                },
-                "MinCapacity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "MaxCapacity",
-                "MinCapacity"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBClusterParameterGroup": {
+        "AWS::Neptune::DBParameterGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134390,7 +142368,7 @@
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBClusterParameterGroup"
+                        "AWS::Neptune::DBParameterGroup"
                     ],
                     "type": "string"
                 },
@@ -134409,7 +142387,7 @@
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBInstance": {
+        "AWS::Neptune::DBSubnetGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134444,115 +142422,17 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowMajorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AutoMinorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AvailabilityZone": {
-                            "type": "string"
-                        },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBInstanceClass": {
-                            "type": "string"
-                        },
-                        "DBInstanceIdentifier": {
-                            "type": "string"
-                        },
-                        "DBParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBSnapshotIdentifier": {
+                        "DBSubnetGroupDescription": {
                             "type": "string"
                         },
                         "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DBInstanceClass"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Neptune::DBInstance"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBParameterGroup": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
+                        "SubnetIds": {
                             "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
                                 "type": "string"
                             },
                             "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Family": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "type": "object"
                         },
                         "Tags": {
                             "items": {
@@ -134562,15 +142442,14 @@
                         }
                     },
                     "required": [
-                        "Description",
-                        "Family",
-                        "Parameters"
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBParameterGroup"
+                        "AWS::Neptune::DBSubnetGroup"
                     ],
                     "type": "string"
                 },
@@ -134589,7 +142468,7 @@
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBSubnetGroup": {
+        "AWS::Neptune::EventSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134624,34 +142503,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DBSubnetGroupDescription": {
-                            "type": "string"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
+                        "Enabled": {
+                            "type": "boolean"
                         },
-                        "SubnetIds": {
+                        "EventCategories": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Tags": {
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DBSubnetGroupDescription",
-                        "SubnetIds"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBSubnetGroup"
+                        "AWS::Neptune::EventSubscription"
                     ],
                     "type": "string"
                 },
@@ -134665,8 +142543,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -135132,6 +143009,15 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts": {
+            "additionalProperties": false,
+            "properties": {
+                "TcpIdleTimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::FirewallPolicy.IPSet": {
             "additionalProperties": false,
             "properties": {
@@ -135177,6 +143063,9 @@
         "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
             "additionalProperties": false,
             "properties": {
+                "FlowTimeouts": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts"
+                },
                 "RuleOrder": {
                     "type": "string"
                 },
@@ -136082,39 +143971,311 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CoreNetworkId": {
+                        "CoreNetworkId": {
+                            "type": "string"
+                        },
+                        "EdgeLocation": {
+                            "type": "string"
+                        },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange"
+                        },
+                        "ProposedSegmentChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CoreNetworkId",
+                        "EdgeLocation",
+                        "Options",
+                        "TransportAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "SegmentName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer": {
+            "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": {
+                        "BgpOptions": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
+                        },
+                        "ConnectAttachmentId": {
+                            "type": "string"
+                        },
+                        "CoreNetworkAddress": {
+                            "type": "string"
+                        },
+                        "InsideCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PeerAddress": {
+                            "type": "string"
+                        },
+                        "SubnetArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectAttachmentId",
+                        "PeerAddress"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectPeer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "CoreNetworkAsn": {
+                    "type": "number"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BgpConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
+                    },
+                    "type": "array"
+                },
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "InsideCidrBlocks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::CoreNetwork": {
+            "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": {
+                        "Description": {
                             "type": "string"
                         },
-                        "EdgeLocation": {
+                        "GlobalNetworkId": {
                             "type": "string"
                         },
-                        "Options": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
-                        },
-                        "ProposedSegmentChange": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        "PolicyDocument": {
+                            "type": "object"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TransportAttachmentId": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "CoreNetworkId",
-                        "EdgeLocation",
-                        "Options",
-                        "TransportAttachmentId"
+                        "GlobalNetworkId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::NetworkManager::ConnectAttachment"
+                        "AWS::NetworkManager::CoreNetwork"
                     ],
                     "type": "string"
                 },
@@ -136133,264 +144294,55 @@
             ],
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "Protocol": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
             "additionalProperties": false,
             "properties": {
-                "AttachmentPolicyRuleNumber": {
+                "Asn": {
                     "type": "number"
                 },
-                "SegmentName": {
+                "EdgeLocation": {
                     "type": "string"
                 },
-                "Tags": {
+                "InsideCidrBlocks": {
                     "items": {
-                        "$ref": "#/definitions/Tag"
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectPeer": {
-            "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": {
-                        "BgpOptions": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
-                        },
-                        "ConnectAttachmentId": {
-                            "type": "string"
-                        },
-                        "CoreNetworkAddress": {
-                            "type": "string"
-                        },
-                        "InsideCidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "PeerAddress": {
-                            "type": "string"
-                        },
-                        "SubnetArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "ConnectAttachmentId",
-                        "PeerAddress"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::ConnectPeer"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "CoreNetworkAsn": {
-                    "type": "number"
-                },
-                "PeerAddress": {
-                    "type": "string"
-                },
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup": {
             "additionalProperties": false,
             "properties": {
-                "BgpConfigurations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
-                    },
-                    "type": "array"
-                },
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "InsideCidrBlocks": {
+                "EdgeLocations": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "PeerAddress": {
+                "Name": {
                     "type": "string"
                 },
-                "Protocol": {
-                    "type": "string"
+                "Segments": {
+                    "$ref": "#/definitions/AWS::NetworkManager::CoreNetwork.Segments"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
             "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "GlobalNetworkId": {
-                            "type": "string"
-                        },
-                        "PolicyDocument": {
-                            "type": "object"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "EdgeLocations": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "GlobalNetworkId"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::CoreNetwork"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
-            "additionalProperties": false,
-            "properties": {
-                "Asn": {
-                    "type": "number"
+                    "type": "array"
                 },
-                "EdgeLocation": {
+                "Name": {
                     "type": "string"
                 },
-                "InsideCidrBlocks": {
+                "SharedSegments": {
                     "items": {
                         "type": "string"
                     },
@@ -136399,19 +144351,16 @@
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
+        "AWS::NetworkManager::CoreNetwork.Segments": {
             "additionalProperties": false,
             "properties": {
-                "EdgeLocations": {
+                "SendTo": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Name": {
-                    "type": "string"
-                },
-                "SharedSegments": {
+                "SendVia": {
                     "items": {
                         "type": "string"
                     },
@@ -136994,6 +144943,12 @@
                         "CoreNetworkId": {
                             "type": "string"
                         },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange"
                         },
@@ -137034,6 +144989,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137231,9 +145204,15 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
                         "PeeringId": {
                             "type": "string"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange"
                         },
@@ -137274,6 +145253,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137333,6 +145330,9 @@
                         "Options": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.VpcOptions"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedSegmentChange"
                         },
@@ -137380,6 +145380,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::VpcAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -138196,6 +146214,22 @@
             },
             "type": "object"
         },
+        "AWS::OSIS::Pipeline.VpcAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachToVpc": {
+                    "type": "boolean"
+                },
+                "CidrBlock": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachToVpc",
+                "CidrBlock"
+            ],
+            "type": "object"
+        },
         "AWS::OSIS::Pipeline.VpcEndpoint": {
             "additionalProperties": false,
             "properties": {
@@ -138225,6 +146259,12 @@
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "VpcAttachmentOptions": {
+                    "$ref": "#/definitions/AWS::OSIS::Pipeline.VpcAttachmentOptions"
+                },
+                "VpcEndpointManagement": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -139635,6 +147675,9 @@
                         "OffPeakWindowOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.OffPeakWindowOptions"
                         },
+                        "SkipShardMigrationWait": {
+                            "type": "boolean"
+                        },
                         "SnapshotOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
                         },
@@ -139688,6 +147731,9 @@
                 "InternalUserDatabaseEnabled": {
                     "type": "boolean"
                 },
+                "JWTOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.JWTOptions"
+                },
                 "MasterUserOptions": {
                     "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
                 },
@@ -139836,6 +147882,24 @@
             ],
             "type": "object"
         },
+        "AWS::OpenSearchService::Domain.JWTOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "PublicKey": {
+                    "type": "string"
+                },
+                "RolesKey": {
+                    "type": "string"
+                },
+                "SubjectKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::OpenSearchService::Domain.LogPublishingOption": {
             "additionalProperties": false,
             "properties": {
@@ -142775,6 +150839,200 @@
             },
             "type": "object"
         },
+        "AWS::PCAConnectorSCEP::Challenge": {
+            "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": {
+                        "ConnectorArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConnectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Challenge"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector": {
+            "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": {
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "MobileDeviceManagement": {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Connector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.IntuneConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AzureApplicationId": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AzureApplicationId",
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "Intune": {
+                    "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.IntuneConfiguration"
+                }
+            },
+            "required": [
+                "Intune"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Panorama::ApplicationInstance": {
             "additionalProperties": false,
             "properties": {
@@ -146766,6 +155024,9 @@
                         "EnrichmentParameters": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeEnrichmentParameters"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "LogConfiguration": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeLogConfiguration"
                         },
@@ -146970,6 +155231,26 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValue": {
+                    "type": "string"
+                },
+                "DimensionValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName",
+                "DimensionValue",
+                "DimensionValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.EcsContainerOverride": {
             "additionalProperties": false,
             "properties": {
@@ -147167,6 +155448,45 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValue",
+                "MeasureValueType",
+                "MultiMeasureAttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Pipes::Pipe.MultiMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings",
+                "MultiMeasureName"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.NetworkConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -147697,6 +156017,9 @@
                 },
                 "StepFunctionStateMachineParameters": {
                     "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetStateMachineParameters"
+                },
+                "TimestreamParameters": {
+                    "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetTimestreamParameters"
                 }
             },
             "type": "object"
@@ -147765,6 +156088,50 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.PipeTargetTimestreamParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "EpochTimeUnit": {
+                    "type": "string"
+                },
+                "MultiMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "SingleMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.SingleMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "TimeFieldType": {
+                    "type": "string"
+                },
+                "TimeValue": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                },
+                "VersionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionMappings",
+                "TimeValue",
+                "VersionValue"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.PlacementConstraint": {
             "additionalProperties": false,
             "properties": {
@@ -147859,6 +156226,26 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.SingleMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureName",
+                "MeasureValue",
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Proton::EnvironmentAccountConnection": {
             "additionalProperties": false,
             "properties": {
@@ -148099,6 +156486,975 @@
             ],
             "type": "object"
         },
+        "AWS::QBusiness::Application": {
+            "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": {
+                        "AttachmentsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AttachmentsConfiguration"
+                        },
+                        "AutoSubscriptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AutoSubscriptionConfiguration"
+                        },
+                        "ClientIdsForOIDC": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.EncryptionConfiguration"
+                        },
+                        "IamIdentityProviderArn": {
+                            "type": "string"
+                        },
+                        "IdentityCenterInstanceArn": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "PersonalizationConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.PersonalizationConfiguration"
+                        },
+                        "QAppsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.QAppsConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AttachmentsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachmentsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AutoSubscriptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoSubscribe": {
+                    "type": "string"
+                },
+                "DefaultSubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoSubscribe"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.PersonalizationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PersonalizationControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PersonalizationControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.QAppsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QAppsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QAppsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentEnrichmentConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SyncSchedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DataSourceVpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "IndexId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeValueOperator": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DateValue": {
+                    "type": "string"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringListValue": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InlineConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration"
+                    },
+                    "type": "array"
+                },
+                "PostExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                },
+                "PreExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.HookConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InvocationCondition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "DocumentContentOperator": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CapacityConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Index.IndexCapacityConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentAttributeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QBusiness::Index.DocumentAttributeConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.DocumentAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Search": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexCapacityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "TextDocumentStatistics": {
+                    "$ref": "#/definitions/AWS::QBusiness::Index.TextDocumentStatistics"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.TextDocumentStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexedTextBytes": {
+                    "type": "number"
+                },
+                "IndexedTextDocumentCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "AuthConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.PluginAuthConfiguration"
+                        },
+                        "CustomPluginConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.CustomPluginConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ServerUrl": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "AuthConfiguration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Plugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.APISchema": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.BasicAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.CustomPluginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSchema": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.APISchema"
+                },
+                "ApiSchemaType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSchema",
+                "ApiSchemaType",
+                "Description"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.PluginAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.BasicAuthConfiguration"
+                },
+                "NoAuthConfiguration": {
+                    "type": "object"
+                },
+                "OAuth2ClientCredentialConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever.RetrieverConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Retriever"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.KendraIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.NativeIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.RetrieverConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KendraIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.KendraIndexConfiguration"
+                },
+                "NativeIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.NativeIndexConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "IdentityProviderConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience.IdentityProviderConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SamplePromptsControlMode": {
+                            "type": "string"
+                        },
+                        "Subtitle": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Title": {
+                            "type": "string"
+                        },
+                        "WelcomeMessage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::WebExperience"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.IdentityProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OpenIDConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration"
+                },
+                "SamlConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.SamlProviderConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsArn": {
+                    "type": "string"
+                },
+                "SecretsRole": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretsArn",
+                "SecretsRole"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.SamlProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthenticationUrl"
+            ],
+            "type": "object"
+        },
         "AWS::QLDB::Ledger": {
             "additionalProperties": false,
             "properties": {
@@ -148484,6 +157840,9 @@
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.SheetDefinition"
@@ -149278,6 +158637,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -149431,6 +158809,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149515,6 +158896,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ComboChartSortConfiguration"
                 },
@@ -150532,6 +159916,9 @@
         "AWS::QuickSight::Analysis.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -150587,6 +159974,9 @@
         "AWS::QuickSight::Analysis.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -150677,6 +160067,9 @@
         "AWS::QuickSight::Analysis.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 }
@@ -151008,6 +160401,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -151164,6 +160560,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.NumericEqualityFilter"
                 },
@@ -151237,6 +160636,9 @@
         "AWS::QuickSight::Analysis.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -151266,6 +160668,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -151411,6 +160816,9 @@
         "AWS::QuickSight::Analysis.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 },
@@ -152616,6 +162024,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153129,6 +162546,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.SmallMultiplesOptions"
                 },
@@ -153491,6 +162911,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153877,6 +163321,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -154723,6 +164170,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -155753,6 +165209,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157127,6 +166592,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -157136,6 +166610,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DataLabelOptions"
                 },
@@ -157172,6 +166649,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157382,6 +166874,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard": {
             "additionalProperties": false,
             "properties": {
@@ -158291,6 +167795,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -158444,6 +167967,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -158528,6 +168054,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ComboChartSortConfiguration"
                 },
@@ -159762,6 +169291,9 @@
         "AWS::QuickSight::Dashboard.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -159817,6 +169349,9 @@
         "AWS::QuickSight::Dashboard.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -159907,6 +169442,9 @@
         "AWS::QuickSight::Dashboard.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 }
@@ -160265,6 +169803,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -160421,6 +169962,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.NumericEqualityFilter"
                 },
@@ -160494,6 +170038,9 @@
         "AWS::QuickSight::Dashboard.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -160523,6 +170070,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -160668,6 +170218,9 @@
         "AWS::QuickSight::Dashboard.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 },
@@ -161873,6 +171426,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -162386,6 +171948,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.SmallMultiplesOptions"
                 },
@@ -162760,6 +172325,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -163146,6 +172735,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -165040,6 +174632,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166432,6 +176033,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -166441,6 +176051,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataLabelOptions"
                 },
@@ -166477,6 +176090,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166687,6 +176315,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSet": {
             "additionalProperties": false,
             "properties": {
@@ -166761,6 +176401,12 @@
                             },
                             "type": "object"
                         },
+                        "FolderArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "ImportMode": {
                             "type": "string"
                         },
@@ -167129,6 +176775,9 @@
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.LookbackWindow"
                 }
             },
+            "required": [
+                "LookbackWindow"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
@@ -167253,8 +176902,7 @@
                 }
             },
             "required": [
-                "Alias",
-                "Source"
+                "Alias"
             ],
             "type": "object"
         },
@@ -167286,6 +176934,11 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Size",
+                "SizeUnit"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.NewDefaultValues": {
@@ -167391,6 +177044,9 @@
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.IncrementalRefresh"
                 }
             },
+            "required": [
+                "IncrementalRefresh"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.RelationalTable": {
@@ -167624,8 +177280,30 @@
                 },
                 "TagColumnOperation": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                },
+                "UntagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UntagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UntagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "TagNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "TagNames"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.UploadSettings": {
@@ -167730,6 +177408,10 @@
                             "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -167748,7 +177430,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -167963,6 +177646,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.IdentityCenterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableIdentityPropagation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -168095,6 +177787,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.RedshiftIAMParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoCreateDatabaseUser": {
+                    "type": "boolean"
+                },
+                "DatabaseGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DatabaseUser": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.RedshiftParameters": {
             "additionalProperties": false,
             "properties": {
@@ -168107,6 +177823,12 @@
                 "Host": {
                     "type": "string"
                 },
+                "IAMParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftIAMParameters"
+                },
+                "IdentityCenterConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.IdentityCenterConfiguration"
+                },
                 "Port": {
                     "type": "number"
                 }
@@ -168127,6 +177849,9 @@
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -168290,6 +178015,113 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Folder": {
+            "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": {
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "FolderId": {
+                            "type": "string"
+                        },
+                        "FolderType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentFolderArn": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Folder.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SharingModel": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Folder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Folder.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::RefreshSchedule": {
             "additionalProperties": false,
             "properties": {
@@ -169286,6 +179118,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -169478,6 +179329,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -169562,6 +179416,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ComboChartSortConfiguration"
                 },
@@ -170555,6 +180412,9 @@
         "AWS::QuickSight::Template.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -170610,6 +180470,9 @@
         "AWS::QuickSight::Template.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -170700,6 +180563,9 @@
         "AWS::QuickSight::Template.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 }
@@ -171031,6 +180897,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -171187,6 +181056,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.NumericEqualityFilter"
                 },
@@ -171260,6 +181132,9 @@
         "AWS::QuickSight::Template.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -171289,6 +181164,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -171434,6 +181312,9 @@
         "AWS::QuickSight::Template.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 },
@@ -172639,6 +182520,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173133,6 +183023,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.SmallMultiplesOptions"
                 },
@@ -173495,6 +183388,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173881,6 +183798,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -174697,6 +184617,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -175727,6 +185656,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -176462,6 +186400,9 @@
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.SheetDefinition"
@@ -177236,6 +187177,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -177245,6 +187195,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DataLabelOptions"
                 },
@@ -177281,6 +187234,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -177491,6 +187459,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Theme": {
             "additionalProperties": false,
             "properties": {
@@ -178222,6 +188202,9 @@
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "Expression": {
                     "type": "string"
                 },
@@ -178328,6 +188311,9 @@
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "IsIncludedInTopic": {
                     "type": "boolean"
                 },
@@ -179013,9 +188999,15 @@
                         "EnableIAMDatabaseAuthentication": {
                             "type": "boolean"
                         },
+                        "EnableLocalWriteForwarding": {
+                            "type": "boolean"
+                        },
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineMode": {
                             "type": "string"
                         },
@@ -179465,6 +189457,9 @@
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180501,6 +190496,9 @@
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180512,6 +190510,12 @@
                         },
                         "StorageEncrypted": {
                             "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "type": "object"
@@ -181220,6 +191224,15 @@
                 "BucketName": {
                     "type": "string"
                 },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogExports": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "S3KeyPrefix": {
                     "type": "string"
                 }
@@ -184641,6 +194654,15 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AcceptRoleSessionName": {
+                            "type": "boolean"
+                        },
+                        "AttributeMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RolesAnywhere::Profile.AttributeMapping"
+                            },
+                            "type": "array"
+                        },
                         "DurationSeconds": {
                             "type": "number"
                         },
@@ -184702,6 +194724,37 @@
             ],
             "type": "object"
         },
+        "AWS::RolesAnywhere::Profile.AttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateField": {
+                    "type": "string"
+                },
+                "MappingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RolesAnywhere::Profile.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateField",
+                "MappingRules"
+            ],
+            "type": "object"
+        },
+        "AWS::RolesAnywhere::Profile.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Specifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Specifier"
+            ],
+            "type": "object"
+        },
         "AWS::RolesAnywhere::TrustAnchor": {
             "additionalProperties": false,
             "properties": {
@@ -186933,6 +196986,9 @@
                 "FirewallDomainListId": {
                     "type": "string"
                 },
+                "FirewallDomainRedirectionAction": {
+                    "type": "string"
+                },
                 "Priority": {
                     "type": "number"
                 },
@@ -187528,6 +197584,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DelegationRecord": {
+                            "type": "string"
+                        },
                         "DomainName": {
                             "type": "string"
                         },
@@ -187554,7 +197613,6 @@
                         }
                     },
                     "required": [
-                        "DomainName",
                         "RuleType"
                     ],
                     "type": "object"
@@ -188492,6 +198550,9 @@
                         "$ref": "#/definitions/AWS::S3::Bucket.Rule"
                     },
                     "type": "array"
+                },
+                "TransitionDefaultMinimumObjectSize": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -190108,6 +200169,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.BucketEncryption"
+                        },
                         "BucketName": {
                             "type": "string"
                         },
@@ -190140,11 +200204,53 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
             ],
             "type": "object"
         },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
         "AWS::S3ObjectLambda::AccessPoint": {
             "additionalProperties": false,
             "properties": {
@@ -191158,6 +201264,18 @@
             ],
             "type": "object"
         },
+        "AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventBusArn"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
             "additionalProperties": false,
             "properties": {
@@ -191167,6 +201285,9 @@
                 "Enabled": {
                     "type": "boolean"
                 },
+                "EventBridgeDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination"
+                },
                 "KinesisFirehoseDestination": {
                     "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
                 },
@@ -191513,6 +201634,1175 @@
             },
             "type": "object"
         },
+        "AWS::SES::MailManagerAddonInstance": {
+            "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": {
+                        "AddonSubscriptionId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonSubscriptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerAddonSubscription": {
+            "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": {
+                        "AddonName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive": {
+            "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": {
+                        "ArchiveName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Retention": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive.ArchiveRetention"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerArchive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive.ArchiveRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "RetentionPeriod": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RetentionPeriod"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint": {
+            "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": {
+                        "IngressPointConfiguration": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint.IngressPointConfiguration"
+                        },
+                        "IngressPointName": {
+                            "type": "string"
+                        },
+                        "RuleSetId": {
+                            "type": "string"
+                        },
+                        "StatusToUpdate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RuleSetId",
+                        "TrafficPolicyId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerIngressPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint.IngressPointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SmtpPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay": {
+            "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": {
+                        "Authentication": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay.RelayAuthentication"
+                        },
+                        "RelayName": {
+                            "type": "string"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "ServerName",
+                        "ServerPort"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRelay"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay.RelayAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "NoAuthentication": {
+                    "type": "object"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet": {
+            "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": {
+                        "RuleSetName": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ArchiveAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "TargetArchive": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArchive"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.DeliverToMailboxAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailboxArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MailboxArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RelayAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailFrom": {
+                    "type": "string"
+                },
+                "Relay": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Relay"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ReplaceRecipientAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplaceWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleAction"
+                    },
+                    "type": "array"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Unless": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeader": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.AddHeaderAction"
+                },
+                "Archive": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ArchiveAction"
+                },
+                "DeliverToMailbox": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.DeliverToMailboxAction"
+                },
+                "Drop": {
+                    "type": "object"
+                },
+                "Relay": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RelayAction"
+                },
+                "ReplaceRecipient": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ReplaceRecipientAction"
+                },
+                "Send": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.SendAction"
+                },
+                "WriteToS3": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.S3Action"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanExpression"
+                },
+                "DmarcExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleDmarcExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpExpression"
+                },
+                "NumberExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberExpression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringExpression"
+                },
+                "VerdictExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleDmarcExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MimeHeaderAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Analysis"
+                },
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                },
+                "S3SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.SendAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy": {
+            "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": {
+                        "DefaultAction": {
+                            "type": "string"
+                        },
+                        "MaxMessageSizeBytes": {
+                            "type": "number"
+                        },
+                        "PolicyStatements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyStatement"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "PolicyStatements"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerTrafficPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressAnalysis"
+                }
+            },
+            "required": [
+                "Analysis"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringExpression"
+                },
+                "TlsExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Conditions"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ReceiptFilter": {
             "additionalProperties": false,
             "properties": {
@@ -191804,6 +203094,9 @@
                 "BucketName": {
                     "type": "string"
                 },
+                "IamRoleArn": {
+                    "type": "string"
+                },
                 "KmsKeyArn": {
                     "type": "string"
                 },
@@ -194955,6 +206248,342 @@
             ],
             "type": "object"
         },
+        "AWS::SSMQuickSetup::ConfigurationManager": {
+            "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": {
+                        "ConfigurationDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationDefinitions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMQuickSetup::ConfigurationManager"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeploymentAdministrationRoleArn": {
+                    "type": "string"
+                },
+                "LocalDeploymentExecutionRoleName": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "TypeVersion": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.StatusSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "LastUpdatedAt": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StatusDetails": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusMessage": {
+                    "type": "string"
+                },
+                "StatusType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LastUpdatedAt",
+                "StatusType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application": {
+            "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": {
+                        "ApplicationProviderArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PortalOptions": {
+                            "$ref": "#/definitions/AWS::SSO::Application.PortalOptionsConfiguration"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationProviderArn",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application.PortalOptionsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SignInOptions": {
+                    "$ref": "#/definitions/AWS::SSO::Application.SignInOptions"
+                },
+                "Visibility": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSO::Application.SignInOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationUrl": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Origin"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::ApplicationAssignment": {
+            "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"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "PrincipalId",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::ApplicationAssignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::Assignment": {
             "additionalProperties": false,
             "properties": {
@@ -195040,6 +206669,73 @@
             ],
             "type": "object"
         },
+        "AWS::SSO::Instance": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -195177,55 +206873,168 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CustomerManagedPolicyReferences": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InlinePolicy": {
-                            "type": "object"
-                        },
-                        "InstanceArn": {
+                        "CustomerManagedPolicyReferences": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
+                        },
+                        "RelayStateType": {
+                            "type": "string"
+                        },
+                        "SessionDuration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::PermissionSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.PermissionsBoundary": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedPolicyReference": {
+                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                },
+                "ManagedPolicyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::App": {
+            "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": {
+                        "AppName": {
                             "type": "string"
                         },
-                        "ManagedPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
+                        "AppType": {
                             "type": "string"
                         },
-                        "PermissionsBoundary": {
-                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
-                        },
-                        "RelayStateType": {
+                        "DomainId": {
                             "type": "string"
                         },
-                        "SessionDuration": {
-                            "type": "string"
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "InstanceArn",
-                        "Name"
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SSO::PermissionSet"
+                        "AWS::SageMaker::App"
                     ],
                     "type": "string"
                 },
@@ -195244,34 +207053,25 @@
             ],
             "type": "object"
         },
-        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+        "AWS::SageMaker::App.ResourceSpec": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "InstanceType": {
                     "type": "string"
                 },
-                "Path": {
+                "LifecycleConfigArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::SSO::PermissionSet.PermissionsBoundary": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomerManagedPolicyReference": {
-                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
                 },
-                "ManagedPolicyArn": {
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::App": {
+        "AWS::SageMaker::AppImageConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195306,39 +207106,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppName": {
+                        "AppImageConfigName": {
                             "type": "string"
                         },
-                        "AppType": {
-                            "type": "string"
+                        "CodeEditorAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
                         },
-                        "DomainId": {
-                            "type": "string"
+                        "JupyterLabAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
                         },
-                        "ResourceSpec": {
-                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserProfileName": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "AppName",
-                        "AppType",
-                        "DomainId",
-                        "UserProfileName"
+                        "AppImageConfigName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::App"
+                        "AWS::SageMaker::AppImageConfig"
                     ],
                     "type": "string"
                 },
@@ -195357,22 +207151,113 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::App.ResourceSpec": {
+        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceType": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "SageMakerImageArn": {
+                "Value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
                 },
-                "SageMakerImageVersionArn": {
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig": {
+        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
+                },
+                "KernelSpecs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "KernelSpecs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "DisplayName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Cluster": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195407,33 +207292,39 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppImageConfigName": {
+                        "ClusterName": {
                             "type": "string"
                         },
-                        "CodeEditorAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
+                        "InstanceGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceGroup"
+                            },
+                            "type": "array"
                         },
-                        "JupyterLabAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
+                        "NodeRecovery": {
+                            "type": "string"
                         },
-                        "KernelGatewayImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        "Orchestrator": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.Orchestrator"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppImageConfigName"
+                        "InstanceGroups"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::AppImageConfig"
+                        "AWS::SageMaker::Cluster"
                     ],
                     "type": "string"
                 },
@@ -195452,109 +207343,129 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterEbsVolumeConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "VolumeSizeInGB": {
+                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+        "AWS::SageMaker::Cluster.ClusterInstanceGroup": {
             "additionalProperties": false,
             "properties": {
-                "ContainerArguments": {
+                "CurrentCount": {
+                    "type": "number"
+                },
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceGroupName": {
+                    "type": "string"
+                },
+                "InstanceStorageConfigs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceStorageConfig"
                     },
                     "type": "array"
                 },
-                "ContainerEntrypoint": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LifeCycleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterLifeCycleConfig"
+                },
+                "OnStartDeepHealthChecks": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "ContainerEnvironmentVariables": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
-                    },
-                    "type": "array"
+                "ThreadsPerCore": {
+                    "type": "number"
                 }
             },
+            "required": [
+                "ExecutionRole",
+                "InstanceCount",
+                "InstanceGroupName",
+                "InstanceType",
+                "LifeCycleConfig"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+        "AWS::SageMaker::Cluster.ClusterInstanceStorageConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "EbsVolumeConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterEbsVolumeConfig"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+        "AWS::SageMaker::Cluster.ClusterLifeCycleConfig": {
             "additionalProperties": false,
             "properties": {
-                "DefaultGid": {
-                    "type": "number"
-                },
-                "DefaultUid": {
-                    "type": "number"
+                "OnCreate": {
+                    "type": "string"
                 },
-                "MountPath": {
+                "SourceS3Uri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "OnCreate",
+                "SourceS3Uri"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "ClusterArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ClusterArn"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+        "AWS::SageMaker::Cluster.Orchestrator": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
-                },
-                "KernelSpecs": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
-                    },
-                    "type": "array"
+                "Eks": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig"
                 }
             },
             "required": [
-                "KernelSpecs"
+                "Eks"
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+        "AWS::SageMaker::Cluster.VpcConfig": {
             "additionalProperties": false,
             "properties": {
-                "DisplayName": {
-                    "type": "string"
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Name": {
-                    "type": "string"
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name"
+                "SecurityGroupIds",
+                "Subnets"
             ],
             "type": "object"
         },
@@ -196350,9 +208261,21 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
@@ -196446,9 +208369,21 @@
         "AWS::SageMaker::Domain.DefaultSpaceSettings": {
             "additionalProperties": false,
             "properties": {
+                "CustomFileSystemConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomFileSystemConfig"
+                    },
+                    "type": "array"
+                },
+                "CustomPosixUserConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.CustomPosixUserConfig"
+                },
                 "ExecutionRole": {
                     "type": "string"
                 },
+                "JupyterLabAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterLabAppSettings"
+                },
                 "JupyterServerAppSettings": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
                 },
@@ -196460,6 +208395,9 @@
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "SpaceStorageSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.DefaultSpaceStorageSettings"
                 }
             },
             "required": [
@@ -196524,9 +208462,30 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CodeRepository"
@@ -196556,6 +208515,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196571,6 +208536,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196656,6 +208627,24 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Domain.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -196706,6 +208695,9 @@
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.StudioWebPortalSettings"
                 }
             },
             "required": [
@@ -197790,6 +209782,9 @@
                         },
                         "VendorGuidance": {
                             "type": "string"
+                        },
+                        "Version": {
+                            "type": "number"
                         }
                     },
                     "required": [
@@ -198277,6 +210272,97 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::MlflowTrackingServer": {
+            "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": {
+                        "ArtifactStoreUri": {
+                            "type": "string"
+                        },
+                        "AutomaticModelRegistration": {
+                            "type": "boolean"
+                        },
+                        "MlflowVersion": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingServerName": {
+                            "type": "string"
+                        },
+                        "TrackingServerSize": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ArtifactStoreUri",
+                        "RoleArn",
+                        "TrackingServerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MlflowTrackingServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model": {
             "additionalProperties": false,
             "properties": {
@@ -198365,6 +210451,22 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Model.AdditionalModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.S3DataSource"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "S3DataSource"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ContainerDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -198401,6 +210503,18 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Model.HubAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HubContentArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HubContentArn"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ImageConfig": {
             "additionalProperties": false,
             "properties": {
@@ -198479,6 +210593,9 @@
                 "CompressionType": {
                     "type": "string"
                 },
+                "HubAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.HubAccessConfig"
+                },
                 "ModelAccessConfig": {
                     "$ref": "#/definitions/AWS::SageMaker::Model.ModelAccessConfig"
                 },
@@ -200000,6 +212117,9 @@
                         "ModelApprovalStatus": {
                             "type": "string"
                         },
+                        "ModelCard": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelCard"
+                        },
                         "ModelMetrics": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelMetrics"
                         },
@@ -200021,12 +212141,18 @@
                         "SamplePayloadUrl": {
                             "type": "string"
                         },
+                        "SecurityConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SecurityConfig"
+                        },
                         "SkipModelValidation": {
                             "type": "string"
                         },
                         "SourceAlgorithmSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SourceAlgorithmSpecification"
                         },
+                        "SourceUri": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -200309,6 +212435,34 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceptEula": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AcceptEula"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.ModelCard": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCardContent": {
+                    "type": "string"
+                },
+                "ModelCardStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ModelCardContent",
+                "ModelCardStatus"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelDataQuality": {
             "additionalProperties": false,
             "properties": {
@@ -200321,6 +212475,15 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.S3ModelDataSource"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelInput": {
             "additionalProperties": false,
             "properties": {
@@ -200378,6 +212541,9 @@
                 "ImageDigest": {
                     "type": "string"
                 },
+                "ModelDataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelDataSource"
+                },
                 "ModelDataUrl": {
                     "type": "string"
                 },
@@ -200452,6 +212618,41 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.S3ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionType": {
+                    "type": "string"
+                },
+                "ModelAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelAccessConfig"
+                },
+                "S3DataType": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionType",
+                "S3DataType",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.SecurityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKeyId"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.SourceAlgorithm": {
             "additionalProperties": false,
             "properties": {
@@ -202274,6 +214475,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202289,6 +214496,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202311,6 +214524,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202320,18 +214536,42 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceAppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceIdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceCodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
                 }
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceIdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceJupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Space.CodeRepository"
@@ -202395,6 +214635,85 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::StudioLifecycleConfig": {
+            "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": {
+                        "StudioLifecycleConfigAppType": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigContent": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StudioLifecycleConfigAppType",
+                        "StudioLifecycleConfigContent",
+                        "StudioLifecycleConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::StudioLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile": {
             "additionalProperties": false,
             "properties": {
@@ -202479,9 +214798,21 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
@@ -202596,9 +214927,30 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CodeRepository"
@@ -202628,6 +214980,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202643,6 +215001,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202665,6 +215029,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202689,6 +215056,24 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -202736,6 +215121,9 @@
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.StudioWebPortalSettings"
                 }
             },
             "type": "object"
@@ -203805,6 +216193,13 @@
                             "type": "object"
                         }
                     },
+                    "required": [
+                        "Actions",
+                        "Criteria",
+                        "Description",
+                        "RuleName",
+                        "RuleOrder"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -203823,7 +216218,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -204245,6 +216641,210 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::ConfigurationPolicy": {
+            "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": {
+                        "ConfigurationPolicy": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.Policy"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicy",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ConfigurationPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityHub": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecurityControlId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EnabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlCustomParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledStandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlsConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration"
+                },
+                "ServiceEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::DelegatedAdmin": {
             "additionalProperties": false,
             "properties": {
@@ -204310,6 +216910,77 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::FindingAggregator": {
+            "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": {
+                        "RegionLinkingMode": {
+                            "type": "string"
+                        },
+                        "Regions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegionLinkingMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::FindingAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
@@ -205171,6 +217842,150 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::OrganizationConfiguration": {
+            "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": {
+                        "AutoEnable": {
+                            "type": "boolean"
+                        },
+                        "AutoEnableStandards": {
+                            "type": "string"
+                        },
+                        "ConfigurationType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoEnable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::OrganizationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::PolicyAssociation": {
+            "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": {
+                        "ConfigurationPolicyId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicyId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::PolicyAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::ProductSubscription": {
             "additionalProperties": false,
             "properties": {
@@ -205206,18 +218021,98 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ProductArn": {
+                        "ProductArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ProductSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl": {
+            "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": {
+                        "LastUpdateReason": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityControlArn": {
+                            "type": "string"
+                        },
+                        "SecurityControlId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ProductArn"
+                        "Parameters"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
+                        "AWS::SecurityHub::SecurityControl"
                     ],
                     "type": "string"
                 },
@@ -205236,6 +218131,60 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::SecurityControl.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
@@ -205685,6 +218634,112 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityLake::SubscriberNotification": {
+            "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": {
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.NotificationConfiguration"
+                        },
+                        "SubscriberArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationConfiguration",
+                        "SubscriberArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityLake::SubscriberNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationApiKeyName": {
+                    "type": "string"
+                },
+                "AuthorizationApiKeyValue": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "TargetRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "TargetRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpsNotificationConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration"
+                },
+                "SqsNotificationConfiguration": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ServiceCatalog::AcceptedPortfolioShare": {
             "additionalProperties": false,
             "properties": {
@@ -208591,6 +221646,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity.EncryptionConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -208627,6 +221685,24 @@
             ],
             "type": "object"
         },
+        "AWS::StepFunctions::Activity.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::Activity.TagsEntry": {
             "additionalProperties": false,
             "properties": {
@@ -208696,6 +221772,9 @@
                             },
                             "type": "object"
                         },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.EncryptionConfiguration"
+                        },
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
                         },
@@ -208753,6 +221832,24 @@
             },
             "type": "object"
         },
+        "AWS::StepFunctions::StateMachine.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::StateMachine.LogDestination": {
             "additionalProperties": false,
             "properties": {
@@ -209287,6 +222384,12 @@
                         "Name": {
                             "type": "string"
                         },
+                        "ResourcesToReplicateTags": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "RunConfig": {
                             "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
                         },
@@ -209618,6 +222721,9 @@
                             },
                             "type": "array"
                         },
+                        "DatabaseArn": {
+                            "type": "string"
+                        },
                         "Instances": {
                             "items": {
                                 "type": "string"
@@ -210583,6 +223689,9 @@
                         "LoggingRole": {
                             "type": "string"
                         },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
                         "SftpConfig": {
                             "$ref": "#/definitions/AWS::Transfer::Connector.SftpConfig"
                         },
@@ -211284,6 +224393,10 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "DestinationFileLocation",
+                "Type"
+            ],
             "type": "object"
         },
         "AWS::Transfer::Workflow.DeleteStepDetails": {
@@ -211511,13 +224624,93 @@
             "properties": {
                 "CognitoUserPoolConfiguration": {
                     "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                },
+                "OpenIdConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audiences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdPrefix": {
+                    "type": "string"
+                },
+                "GroupConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "TokenSelection": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection"
                 }
             },
             "required": [
-                "CognitoUserPoolConfiguration"
+                "Issuer",
+                "TokenSelection"
             ],
             "type": "object"
         },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupClaim": {
+                    "type": "string"
+                },
+                "GroupEntityType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupClaim",
+                "GroupEntityType"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration"
+                },
+                "IdentityTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::VerifiedPermissions::Policy": {
             "additionalProperties": false,
             "properties": {
@@ -218211,6 +231404,140 @@
             },
             "type": "object"
         },
+        "AWS::WorkSpaces::WorkspacesPool": {
+            "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": {
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.ApplicationSettings"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Capacity": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.Capacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.TimeoutSettings"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "Capacity",
+                        "DirectoryId",
+                        "PoolName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::WorkspacesPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SettingsGroup": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.Capacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredUserSessions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredUserSessions"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.TimeoutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "IdleDisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "MaxUserDurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WorkSpacesThinClient::Environment": {
             "additionalProperties": false,
             "properties": {
@@ -218255,6 +231582,12 @@
                         "DesktopEndpoint": {
                             "type": "string"
                         },
+                        "DeviceCreationTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "KmsKeyArn": {
                             "type": "string"
                         },
@@ -218467,6 +231800,12 @@
                         },
                         "PortalArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -218993,6 +232332,9 @@
                         "CustomerManagedKey": {
                             "type": "string"
                         },
+                        "DeepLinkAllowed": {
+                            "type": "string"
+                        },
                         "DisconnectTimeoutInMinutes": {
                             "type": "number"
                         },
@@ -219720,6 +233062,9 @@
                         {
                             "$ref": "#/definitions/AWS::APS::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ARCZonalShift::ZonalAutoshiftConfiguration"
                         },
@@ -219996,6 +233341,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppSync::SourceApiAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppTest::TestCase"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
                         },
@@ -220005,6 +233353,9 @@
                         {
                             "$ref": "#/definitions/AWS::ApplicationInsights::Application"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Athena::CapacityReservation"
                         },
@@ -220104,12 +233455,30 @@
                         {
                             "$ref": "#/definitions/AWS::Bedrock::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::Guardrail"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::GuardrailVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Prompt"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::PromptVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::BillingConductor::BillingGroup"
                         },
@@ -220170,6 +233539,12 @@
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::Membership"
                         },
@@ -220446,6 +233821,9 @@
                         {
                             "$ref": "#/definitions/AWS::Config::StoredQuery"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::AgentStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::ApprovedOrigin"
                         },
@@ -220509,6 +233887,9 @@
                         {
                             "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::View"
                         },
@@ -220656,18 +234037,30 @@
                         {
                             "$ref": "#/definitions/AWS::DataZone::Environment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentBlueprintConfiguration"
                         },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentProfile"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::GroupProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::Project"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::SubscriptionTarget"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::UserProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Farm"
                         },
@@ -220680,6 +234073,9 @@
                         {
                             "$ref": "#/definitions/AWS::Deadline::MeteredProduct"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Deadline::Monitor"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Queue"
                         },
@@ -221409,6 +234805,9 @@
                         {
                             "$ref": "#/definitions/AWS::Glue::Trigger"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Glue::Workflow"
                         },
@@ -221487,6 +234886,9 @@
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::IPSet"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan"
+                        },
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::Master"
                         },
@@ -221562,6 +234964,9 @@
                         {
                             "$ref": "#/definitions/AWS::IVS::PlaybackRestrictionPolicy"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PublicKey"
+                        },
                         {
                             "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
                         },
@@ -221871,6 +235276,9 @@
                         {
                             "$ref": "#/definitions/AWS::KendraRanking::ExecutionPlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::ResourcePolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kinesis::Stream"
                         },
@@ -221958,6 +235366,9 @@
                         {
                             "$ref": "#/definitions/AWS::Lambda::Version"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::LaunchWizard::Deployment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Lex::Bot"
                         },
@@ -222168,6 +235579,24 @@
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Channel"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Input"
                         },
@@ -222180,6 +235609,15 @@
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Network"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SdiSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SignalMap"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaPackage::Asset"
                         },
@@ -222261,6 +235699,9 @@
                         {
                             "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::EventSubscription"
+                        },
                         {
                             "$ref": "#/definitions/AWS::NeptuneGraph::Graph"
                         },
@@ -222438,6 +235879,12 @@
                         {
                             "$ref": "#/definitions/AWS::PCAConnectorAD::TemplateGroupAccessControlEntry"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Challenge"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
                         },
@@ -222546,6 +235993,24 @@
                         {
                             "$ref": "#/definitions/AWS::Proton::ServiceTemplate"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QLDB::Ledger"
                         },
@@ -222564,6 +236029,9 @@
                         {
                             "$ref": "#/definitions/AWS::QuickSight::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Folder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QuickSight::RefreshSchedule"
                         },
@@ -222891,6 +236359,27 @@
                         {
                             "$ref": "#/definitions/AWS::SES::EmailIdentity"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SES::ReceiptFilter"
                         },
@@ -222972,9 +236461,21 @@
                         {
                             "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::ApplicationAssignment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::Assignment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Instance"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
                         },
@@ -222987,6 +236488,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
                         },
@@ -223023,6 +236527,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::InferenceExperiment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MlflowTrackingServer"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Model"
                         },
@@ -223062,6 +236569,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Space"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::StudioLifecycleConfig"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::UserProfile"
                         },
@@ -223089,18 +236599,33 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::FindingAggregator"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Insight"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::OrganizationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::PolicyAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::SecurityControl"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
@@ -223113,6 +236638,9 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityLake::Subscriber"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
                         },
@@ -223404,6 +236932,9 @@
                         {
                             "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool"
+                        },
                         {
                             "$ref": "#/definitions/AWS::WorkSpacesThinClient::Environment"
                         },
diff --git a/schema/sam.go b/schema/sam.go
index 566edb7586..5dd9ce81ea 100644
--- a/schema/sam.go
+++ b/schema/sam.go
@@ -541,6 +541,9 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.CrlDistributionPointExtensionConfiguration": {
@@ -597,7 +600,6 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "NameAssigner",
                 "PartyName"
             ],
             "type": "object"
@@ -675,6 +677,9 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.OtherName": {
@@ -1232,6 +1237,71 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus": {
+            "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": {
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::ARCZonalShift::ZonalAutoshiftConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -1614,11 +1684,9 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "AutoMinorVersionUpgrade",
                         "BrokerName",
                         "DeploymentMode",
                         "EngineType",
-                        "EngineVersion",
                         "HostInstanceType",
                         "PubliclyAccessible",
                         "Users"
@@ -1867,7 +1935,6 @@ var SamSchema = `{
                     "required": [
                         "Data",
                         "EngineType",
-                        "EngineVersion",
                         "Name"
                     ],
                     "type": "object"
@@ -2041,6 +2108,9 @@ var SamSchema = `{
                         "BuildSpec": {
                             "type": "string"
                         },
+                        "CacheConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.CacheConfig"
+                        },
                         "CustomHeaders": {
                             "type": "string"
                         },
@@ -2170,6 +2240,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Amplify::App.CacheConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Amplify::App.CustomRule": {
             "additionalProperties": false,
             "properties": {
@@ -6489,12 +6568,30 @@ var SamSchema = `{
                             "type": "string"
                         },
                         "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "RequestTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "ResponseParameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameterMap"
+                                }
+                            },
                             "type": "object"
                         },
                         "TemplateSelectionExpression": {
@@ -6544,13 +6641,9 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "Destination",
-                "Source"
-            ],
             "type": "object"
         },
-        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+        "AWS::ApiGatewayV2::Integration.ResponseParameterMap": {
             "additionalProperties": false,
             "properties": {
                 "ResponseParameters": {
@@ -10105,7 +10198,8 @@ var SamSchema = `{
                     "required": [
                         "ApplicationSourceConfig",
                         "Description",
-                        "Name"
+                        "Name",
+                        "Namespace"
                     ],
                     "type": "object"
                 },
@@ -16546,7 +16640,7 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget": {
+        "AWS::AppTest::TestCase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -16581,46 +16675,37 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MaxCapacity": {
-                            "type": "number"
-                        },
-                        "MinCapacity": {
-                            "type": "number"
-                        },
-                        "ResourceId": {
-                            "type": "string"
-                        },
-                        "RoleARN": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ScalableDimension": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ScheduledActions": {
+                        "Steps": {
                             "items": {
-                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                                "$ref": "#/definitions/AWS::AppTest::TestCase.Step"
                             },
                             "type": "array"
                         },
-                        "ServiceNamespace": {
-                            "type": "string"
-                        },
-                        "SuspendedState": {
-                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MaxCapacity",
-                        "MinCapacity",
-                        "ResourceId",
-                        "ScalableDimension",
-                        "ServiceNamespace"
+                        "Name",
+                        "Steps"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                        "AWS::AppTest::TestCase"
                     ],
                     "type": "string"
                 },
@@ -16639,62 +16724,542 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+        "AWS::AppTest::TestCase.Batch": {
             "additionalProperties": false,
             "properties": {
-                "MaxCapacity": {
-                    "type": "number"
+                "BatchJobName": {
+                    "type": "string"
                 },
-                "MinCapacity": {
-                    "type": "number"
+                "BatchJobParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "BatchJobName"
+            ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+        "AWS::AppTest::TestCase.CloudFormationAction": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
+                "ActionType": {
                     "type": "string"
                 },
-                "ScalableTargetAction": {
-                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.CompareAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Input"
                 },
-                "Schedule": {
+                "Output": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Output"
+                }
+            },
+            "required": [
+                "Input"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ccsid": {
                     "type": "string"
                 },
-                "ScheduledActionName": {
+                "Format": {
                     "type": "string"
                 },
-                "StartTime": {
+                "Length": {
+                    "type": "number"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Timezone": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Schedule",
-                "ScheduledActionName"
+                "Ccsid",
+                "Format",
+                "Length",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+        "AWS::AppTest::TestCase.DatabaseCDC": {
             "additionalProperties": false,
             "properties": {
-                "DynamicScalingInSuspended": {
-                    "type": "boolean"
+                "SourceMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.SourceDatabaseMetadata"
                 },
-                "DynamicScalingOutSuspended": {
-                    "type": "boolean"
+                "TargetMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TargetDatabaseMetadata"
+                }
+            },
+            "required": [
+                "SourceMetadata",
+                "TargetMetadata"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.FileMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppTest::TestCase.DataSet"
+                    },
+                    "type": "array"
                 },
-                "ScheduledScalingSuspended": {
+                "DatabaseCDC": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.DatabaseCDC"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.InputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.InputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.FileMetadata"
+                },
+                "SourceLocation": {
+                    "type": "string"
+                },
+                "TargetLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileMetadata",
+                "SourceLocation",
+                "TargetLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2ManagedActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ForceStop": {
                     "type": "boolean"
+                },
+                "ImportDataSetLocation": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalingPolicy": {
+        "AWS::AppTest::TestCase.M2ManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2NonManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionType"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DmsTaskArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Batch": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Batch"
+                },
+                "Tn3270": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TN3270"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.OutputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.OutputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.ResourceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CloudFormationAction"
+                },
+                "M2ManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedApplicationAction"
+                },
+                "M2NonManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2NonManagedApplicationAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Script": {
+            "additionalProperties": false,
+            "properties": {
+                "ScriptLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScriptLocation",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.SourceDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Step": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.StepAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.StepAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CompareAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CompareAction"
+                },
+                "MainframeAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeAction"
+                },
+                "ResourceAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.ResourceAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TN3270": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Script": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Script"
+                }
+            },
+            "required": [
+                "Script"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TargetDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TestCaseLatestVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Status",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "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": {
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MinCapacity": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScheduledActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "SuspendedState": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        }
+                    },
+                    "required": [
+                        "MaxCapacity",
+                        "MinCapacity",
+                        "ResourceId",
+                        "ScalableDimension",
+                        "ServiceNamespace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "ScalableTargetAction": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                },
+                "Schedule": {
+                    "type": "string"
+                },
+                "ScheduledActionName": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule",
+                "ScheduledActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicScalingInSuspended": {
+                    "type": "boolean"
+                },
+                "DynamicScalingOutSuspended": {
+                    "type": "boolean"
+                },
+                "ScheduledScalingSuspended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17467,7 +18032,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation": {
+        "AWS::ApplicationSignals::ServiceLevelObjective": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17502,31 +18067,36 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CapacityAssignmentConfiguration": {
-                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Goal": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Goal"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "RequestBasedSli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli"
+                        },
+                        "Sli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Sli"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TargetDpus": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "Name",
-                        "TargetDpus"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Athena::CapacityReservation"
+                        "AWS::ApplicationSignals::ServiceLevelObjective"
                     ],
                     "type": "string"
                 },
@@ -17545,37 +18115,378 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval": {
             "additionalProperties": false,
             "properties": {
-                "WorkgroupNames": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Duration",
+                "DurationUnit",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Goal": {
+            "additionalProperties": false,
+            "properties": {
+                "AttainmentGoal": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Interval"
+                },
+                "WarningThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Interval": {
+            "additionalProperties": false,
+            "properties": {
+                "CalendarInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval"
+                },
+                "RollingInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Dimension"
                     },
                     "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "WorkgroupNames"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricStat": {
             "additionalProperties": false,
             "properties": {
-                "CapacityAssignments": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "BadCountMetric": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "GoodCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "RequestBasedSliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric"
+                }
+            },
+            "required": [
+                "RequestBasedSliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "MonitoredRequestCountMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "TotalRequestCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
                     },
                     "type": "array"
                 }
             },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                }
+            },
             "required": [
-                "CapacityAssignments"
+                "Duration",
+                "DurationUnit"
             ],
             "type": "object"
         },
-        "AWS::Athena::DataCatalog": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.Sli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "SliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.SliMetric"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricThreshold",
+                "SliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.SliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "PeriodSeconds": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation": {
+            "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": {
+                        "CapacityAssignmentConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetDpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetDpus"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkgroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WorkgroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityAssignments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CapacityAssignments"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -19184,6 +20095,12 @@ var SamSchema = `{
                 "MetricName": {
                     "type": "string"
                 },
+                "Metrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery"
+                    },
+                    "type": "array"
+                },
                 "Namespace": {
                     "type": "string"
                 },
@@ -19194,11 +20111,6 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "MetricName",
-                "Namespace",
-                "Statistic"
-            ],
             "type": "object"
         },
         "AWS::AutoScaling::ScalingPolicy.Metric": {
@@ -19483,179 +20395,222 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::ScheduledAction": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Id": {
                     "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "DesiredCapacity": {
-                            "type": "number"
-                        },
-                        "EndTime": {
-                            "type": "string"
-                        },
-                        "MaxSize": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "Recurrence": {
-                            "type": "string"
-                        },
-                        "StartTime": {
-                            "type": "string"
-                        },
-                        "TimeZone": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::ScheduledAction"
-                    ],
+                "Label": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat": {
             "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "InstanceReusePolicy": {
-                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
-                        },
-                        "MaxGroupPreparedCapacity": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "PoolState": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
+                "Metric": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.Metric"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::WarmPool"
-                    ],
+                "Stat": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Metric",
+                "Stat"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "ReuseOnScaleIn": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::AutoScalingPlans::ScalingPlan": {
+        "AWS::AutoScaling::ScheduledAction": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "number"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Recurrence": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "InstanceReusePolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
+                        },
+                        "MaxGroupPreparedCapacity": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "PoolState": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::WarmPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ReuseOnScaleIn": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20053,6 +21008,9 @@ var SamSchema = `{
         "AWS::B2BI::Capability.EdiConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CapabilityDirection": {
+                    "type": "string"
+                },
                 "InputLocation": {
                     "$ref": "#/definitions/AWS::B2BI::Capability.S3Location"
                 },
@@ -20151,6 +21109,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "CapabilityOptions": {
+                            "$ref": "#/definitions/AWS::B2BI::Partnership.CapabilityOptions"
+                        },
                         "Email": {
                             "type": "string"
                         },
@@ -20171,6 +21132,7 @@ var SamSchema = `{
                         }
                     },
                     "required": [
+                        "Capabilities",
                         "Email",
                         "Name",
                         "ProfileId"
@@ -20198,93 +21160,112 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::B2BI::Profile": {
+        "AWS::B2BI::Partnership.CapabilityOptions": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "OutboundEdi": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.OutboundEdiOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.OutboundEdiOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "X12": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Envelope"
+                }
+            },
+            "required": [
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Delimiters": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentSeparator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DataElementSeparator": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "SegmentTerminator": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Envelope": {
+            "additionalProperties": false,
+            "properties": {
+                "Common": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12OutboundEdiHeaders"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12FunctionalGroupHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationReceiverCode": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "ApplicationSenderCode": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "BusinessName": {
-                            "type": "string"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "Logging": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Phone": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "BusinessName",
-                        "Logging",
-                        "Name",
-                        "Phone"
-                    ],
-                    "type": "object"
+                "ResponsibleAgencyCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12InterchangeControlHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "AcknowledgmentRequestedCode": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::B2BI::Profile"
-                    ],
+                "ReceiverId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ReceiverIdQualifier": {
+                    "type": "string"
+                },
+                "RepetitionSeparator": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "SenderIdQualifier": {
+                    "type": "string"
+                },
+                "UsageIndicatorCode": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer": {
+        "AWS::B2BI::Partnership.X12OutboundEdiHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiters": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Delimiters"
+                },
+                "FunctionalGroupHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12FunctionalGroupHeaders"
+                },
+                "InterchangeControlHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12InterchangeControlHeaders"
+                },
+                "ValidateEdi": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Profile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20319,21 +21300,107 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EdiType": {
-                            "$ref": "#/definitions/AWS::B2BI::Transformer.EdiType"
+                        "BusinessName": {
+                            "type": "string"
                         },
-                        "FileFormat": {
+                        "Email": {
                             "type": "string"
                         },
-                        "MappingTemplate": {
+                        "Logging": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "SampleDocument": {
+                        "Phone": {
                             "type": "string"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BusinessName",
+                        "Logging",
+                        "Name",
+                        "Phone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::B2BI::Profile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer": {
+            "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": {
+                        "InputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.InputConversion"
+                        },
+                        "Mapping": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.Mapping"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.OutputConversion"
+                        },
+                        "SampleDocuments": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocuments"
+                        },
                         "Status": {
                             "type": "string"
                         },
@@ -20345,9 +21412,6 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "EdiType",
-                        "FileFormat",
-                        "MappingTemplate",
                         "Name",
                         "Status"
                     ],
@@ -20374,15 +21438,91 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer.EdiType": {
+        "AWS::B2BI::Transformer.FormatOptions": {
             "additionalProperties": false,
             "properties": {
-                "X12Details": {
+                "X12": {
                     "$ref": "#/definitions/AWS::B2BI::Transformer.X12Details"
                 }
             },
             "required": [
-                "X12Details"
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.InputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "FromFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FromFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.Mapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Template": {
+                    "type": "string"
+                },
+                "TemplateLanguage": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateLanguage"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.OutputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "ToFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ToFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocumentKeys": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Output": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Keys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocumentKeys"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Keys"
             ],
             "type": "object"
         },
@@ -21413,6 +22553,9 @@ var SamSchema = `{
                         "ScheduleExpressionTimezone": {
                             "type": "string"
                         },
+                        "ScheduleStatus": {
+                            "type": "string"
+                        },
                         "StartWindowHours": {
                             "type": "number"
                         },
@@ -21741,6 +22884,9 @@ var SamSchema = `{
                         "ComputeResources": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
                         },
+                        "Context": {
+                            "type": "string"
+                        },
                         "EksConfiguration": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.EksConfiguration"
                         },
@@ -22618,6 +23764,9 @@ var SamSchema = `{
                 "EcsProperties": {
                     "$ref": "#/definitions/AWS::Batch::JobDefinition.EcsProperties"
                 },
+                "EksProperties": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EksProperties"
+                },
                 "InstanceTypes": {
                     "items": {
                         "type": "string"
@@ -23212,6 +24361,9 @@ var SamSchema = `{
                         "FoundationModel": {
                             "type": "string"
                         },
+                        "GuardrailConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.GuardrailConfiguration"
+                        },
                         "IdleSessionTTLInSeconds": {
                             "type": "number"
                         },
@@ -23290,13 +24442,13 @@ var SamSchema = `{
         "AWS::Bedrock::Agent.ActionGroupExecutor": {
             "additionalProperties": false,
             "properties": {
+                "CustomControl": {
+                    "type": "string"
+                },
                 "Lambda": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Lambda"
-            ],
             "type": "object"
         },
         "AWS::Bedrock::Agent.AgentActionGroup": {
@@ -23317,6 +24469,9 @@ var SamSchema = `{
                 "Description": {
                     "type": "string"
                 },
+                "FunctionSchema": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.FunctionSchema"
+                },
                 "ParentActionGroupSignature": {
                     "type": "string"
                 },
@@ -23348,367 +24503,154 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.InferenceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumLength": {
-                    "type": "number"
-                },
-                "StopSequences": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Temperature": {
-                    "type": "number"
-                },
-                "TopK": {
-                    "type": "number"
-                },
-                "TopP": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Agent.PromptConfiguration": {
+        "AWS::Bedrock::Agent.Function": {
             "additionalProperties": false,
             "properties": {
-                "BasePromptTemplate": {
-                    "type": "string"
-                },
-                "InferenceConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
-                },
-                "ParserMode": {
-                    "type": "string"
-                },
-                "PromptCreationMode": {
+                "Description": {
                     "type": "string"
                 },
-                "PromptState": {
+                "Name": {
                     "type": "string"
                 },
-                "PromptType": {
-                    "type": "string"
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.ParameterDetail"
+                        }
+                    },
+                    "type": "object"
                 }
             },
+            "required": [
+                "Name"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
+        "AWS::Bedrock::Agent.FunctionSchema": {
             "additionalProperties": false,
             "properties": {
-                "OverrideLambda": {
-                    "type": "string"
-                },
-                "PromptConfigurations": {
+                "Functions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.Function"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PromptConfigurations"
+                "Functions"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.S3Identifier": {
+        "AWS::Bedrock::Agent.GuardrailConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "S3BucketName": {
+                "GuardrailIdentifier": {
                     "type": "string"
                 },
-                "S3ObjectKey": {
+                "GuardrailVersion": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias": {
+        "AWS::Bedrock::Agent.InferenceConfiguration": {
             "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"
+                "MaximumLength": {
+                    "type": "number"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "AgentAliasName": {
-                            "type": "string"
-                        },
-                        "AgentId": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "RoutingConfiguration": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "AgentAliasName",
-                        "AgentId"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::AgentAlias"
-                    ],
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+        "AWS::Bedrock::Agent.ParameterDetail": {
             "additionalProperties": false,
             "properties": {
-                "EndDate": {
+                "Description": {
                     "type": "string"
                 },
-                "RoutingConfiguration": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                    },
-                    "type": "array"
+                "Required": {
+                    "type": "boolean"
                 },
-                "StartDate": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
-            "additionalProperties": false,
-            "properties": {
-                "AgentVersion": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "AgentVersion"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource": {
+        "AWS::Bedrock::Agent.PromptConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "BasePromptTemplate": {
                     "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": {
-                        "DataSourceConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "KnowledgeBaseId": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ServerSideEncryptionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
-                        },
-                        "VectorIngestionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
-                        }
-                    },
-                    "required": [
-                        "DataSourceConfiguration",
-                        "KnowledgeBaseId",
-                        "Name"
-                    ],
-                    "type": "object"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::DataSource"
-                    ],
+                "ParserMode": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingStrategy": {
+                "PromptCreationMode": {
                     "type": "string"
                 },
-                "FixedSizeChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
-                }
-            },
-            "required": [
-                "ChunkingStrategy"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3Configuration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
-                },
-                "Type": {
+                "PromptState": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "S3Configuration",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxTokens": {
-                    "type": "number"
                 },
-                "OverlapPercentage": {
-                    "type": "number"
+                "PromptType": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "MaxTokens",
-                "OverlapPercentage"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BucketArn": {
+                "OverrideLambda": {
                     "type": "string"
                 },
-                "InclusionPrefixes": {
+                "PromptConfigurations": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "BucketArn"
+                "PromptConfigurations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+        "AWS::Bedrock::Agent.S3Identifier": {
             "additionalProperties": false,
             "properties": {
-                "KmsKeyArn": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectKey": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Guardrail": {
+        "AWS::Bedrock::AgentAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -23743,50 +24685,155 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BlockedInputMessaging": {
+                        "AgentAliasName": {
                             "type": "string"
                         },
-                        "BlockedOutputsMessaging": {
+                        "AgentId": {
                             "type": "string"
                         },
-                        "ContentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
-                            "type": "string"
+                        "RoutingConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                            },
+                            "type": "array"
                         },
-                        "Name": {
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AgentAliasName",
+                        "AgentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Bedrock::AgentAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EndDate": {
+                    "type": "string"
+                },
+                "RoutingConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                    },
+                    "type": "array"
+                },
+                "StartDate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SensitiveInformationPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
-                        },
-                        "Tags": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDeletionPolicy": {
+                            "type": "string"
                         },
-                        "TopicPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
                         },
-                        "WordPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KnowledgeBaseId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
+                        },
+                        "VectorIngestionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
                         }
                     },
                     "required": [
-                        "BlockedInputMessaging",
-                        "BlockedOutputsMessaging",
+                        "DataSourceConfiguration",
+                        "KnowledgeBaseId",
                         "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::Guardrail"
+                        "AWS::Bedrock::DataSource"
                     ],
                     "type": "string"
                 },
@@ -23805,46 +24852,144 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
+        "AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "InputStrength": {
+                "ModelArn": {
                     "type": "string"
                 },
-                "OutputStrength": {
+                "ParsingPrompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingPrompt"
+                }
+            },
+            "required": [
+                "ModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingStrategy": {
+                    "type": "string"
+                },
+                "FixedSizeChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
+                },
+                "HierarchicalChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration"
+                },
+                "SemanticChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SemanticChunkingConfiguration"
+                }
+            },
+            "required": [
+                "ChunkingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
+                "HostType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostType",
+                "HostUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.CrawlFilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PatternObjectFilter": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilterConfiguration"
+                },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InputStrength",
-                "OutputStrength",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
+        "AWS::Bedrock::DataSource.CustomTransformationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FiltersConfig": {
+                "IntermediateStorage": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.IntermediateStorage"
+                },
+                "Transformations": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.Transformation"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "FiltersConfig"
+                "IntermediateStorage",
+                "Transformations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointDataSourceConfiguration"
+                },
                 "Type": {
                     "type": "string"
+                },
+                "WebConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebDataSourceConfiguration"
                 }
             },
             "required": [
@@ -23852,135 +24997,438 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "Type": {
-                    "type": "string"
+                "OverlapPercentage": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Action",
-                "Type"
+                "MaxTokens",
+                "OverlapPercentage"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.RegexConfig": {
+        "AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "LevelConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration"
+                    },
+                    "type": "array"
                 },
-                "Description": {
-                    "type": "string"
+                "OverlapTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LevelConfigurations",
+                "OverlapTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.IntermediateStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockFoundationModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration"
                 },
-                "Name": {
+                "ParsingStrategy": {
                     "type": "string"
-                },
-                "Pattern": {
+                }
+            },
+            "required": [
+                "ParsingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingPrompt": {
+            "additionalProperties": false,
+            "properties": {
+                "ParsingPromptText": {
                     "type": "string"
                 }
             },
             "required": [
-                "Action",
-                "Name",
-                "Pattern"
+                "ParsingPromptText"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilter": {
             "additionalProperties": false,
             "properties": {
-                "PiiEntitiesConfig": {
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "RegexesConfig": {
+                "InclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "ObjectType": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ObjectType"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilterConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Definition": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Filters"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
                     "type": "string"
                 },
-                "Examples": {
+                "BucketOwnerAccountId": {
+                    "type": "string"
+                },
+                "InclusionPrefixes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "BucketArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "URI"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration"
                 },
-                "Name": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
                     "type": "string"
                 },
-                "Type": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "HostUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Definition",
-                "Name",
-                "Type"
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostUrl"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
+        "AWS::Bedrock::DataSource.SeedUrl": {
             "additionalProperties": false,
             "properties": {
-                "TopicsConfig": {
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SemanticChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BreakpointPercentileThreshold": {
+                    "type": "number"
+                },
+                "BufferSize": {
+                    "type": "number"
+                },
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BreakpointPercentileThreshold",
+                "BufferSize",
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                },
+                "HostType": {
+                    "type": "string"
+                },
+                "SiteUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "TenantId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TopicsConfig"
+                "AuthType",
+                "CredentialsSecretArn",
+                "Domain",
+                "HostType",
+                "SiteUrls"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordConfig": {
+        "AWS::Bedrock::DataSource.Transformation": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
+                "StepToApply": {
                     "type": "string"
+                },
+                "TransformationFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationFunction"
                 }
             },
             "required": [
-                "Text"
+                "StepToApply",
+                "TransformationFunction"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+        "AWS::Bedrock::DataSource.TransformationFunction": {
             "additionalProperties": false,
             "properties": {
-                "ManagedWordListsConfig": {
+                "TransformationLambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationLambdaConfiguration"
+                }
+            },
+            "required": [
+                "TransformationLambdaConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.TransformationLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.UrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.SeedUrl"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
                 },
-                "WordsConfig": {
+                "CustomTransformationConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CustomTransformationConfiguration"
+                },
+                "ParsingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerLimits": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerLimits"
+                },
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionFilters": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "Scope": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase": {
+        "AWS::Bedrock::DataSource.WebCrawlerLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "UrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.UrlConfiguration"
+                }
+            },
+            "required": [
+                "UrlConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24015,20 +25463,35 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "KnowledgeBaseConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDefinition"
                         },
-                        "Name": {
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.S3Location"
+                        },
+                        "DefinitionString": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StorageConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
                         },
                         "Tags": {
                             "additionalProperties": true,
@@ -24038,19 +25501,26 @@ var SamSchema = `{
                                 }
                             },
                             "type": "object"
+                        },
+                        "TestAliasTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "KnowledgeBaseConfiguration",
-                        "Name",
-                        "RoleArn",
-                        "StorageConfiguration"
+                        "ExecutionRoleArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::KnowledgeBase"
+                        "AWS::Bedrock::Flow"
                     ],
                     "type": "string"
                 },
@@ -24069,187 +25539,517 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "AgentAliasArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.ConditionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
                     "type": "string"
                 },
-                "VectorKnowledgeBaseConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                "Name": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "VectorKnowledgeBaseConfiguration"
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+        "AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CollectionArn": {
+                "Condition": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnectionConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                "Name": {
+                    "type": "string"
                 },
-                "VectorIndexName": {
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "CollectionArn",
-                "FieldMapping",
-                "VectorIndexName"
+                "Name",
+                "Source",
+                "Target",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+        "AWS::Bedrock::Flow.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
-                    "type": "string"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration"
                 },
-                "TextField": {
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
                     "type": "string"
                 },
-                "VectorField": {
+                "TargetInput": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField",
-                "VectorField"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+        "AWS::Bedrock::Flow.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionString": {
+                "Connections": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnection"
+                    },
+                    "type": "array"
+                },
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNode"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeConfiguration"
+                },
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "CredentialsSecretArn": {
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeOutput"
+                    },
+                    "type": "array"
+                },
+                "Type": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.AgentFlowNodeConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                "Collector": {
+                    "type": "object"
                 },
-                "Namespace": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.ConditionFlowNodeConfiguration"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Iterator": {
+                    "type": "object"
+                },
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration"
+                },
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "ConnectionString",
-                "CredentialsSecretArn",
-                "FieldMapping"
+                "Expression",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+        "AWS::Bedrock::Flow.FlowNodeOutput": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "Name": {
                     "type": "string"
                 },
-                "TextField": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+        "AWS::Bedrock::Flow.FlowValidation": {
             "additionalProperties": false,
             "properties": {
-                "CredentialsSecretArn": {
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
                     "type": "string"
                 },
-                "DatabaseName": {
+                "ModelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LexFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                "LocaleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BotAliasArn",
+                "LocaleId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInferenceConfiguration"
                 },
-                "ResourceArn": {
+                "ModelId": {
                     "type": "string"
                 },
-                "TableName": {
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "CredentialsSecretArn",
-                "DatabaseName",
-                "FieldMapping",
-                "ResourceArn",
-                "TableName"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+        "AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "PromptArn": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration"
                 },
-                "PrimaryKeyField": {
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "TextField": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "VectorField": {
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "PrimaryKeyField",
-                "TextField",
-                "VectorField"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+        "AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "OpensearchServerlessConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
-                },
-                "PineconeConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
                 },
-                "RdsConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "Type": {
+                "Version": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.StorageFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "EmbeddingModelArn": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.StorageFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "EmbeddingModelArn"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup": {
+        "AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24284,39 +26084,41 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountGrouping": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
-                        },
-                        "ComputationPreference": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
                         },
-                        "PrimaryAccountId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "RoutingConfiguration": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "AccountGrouping",
-                        "ComputationPreference",
+                        "FlowArn",
                         "Name",
-                        "PrimaryAccountId"
+                        "RoutingConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::BillingGroup"
+                        "AWS::Bedrock::FlowAlias"
                     ],
                     "type": "string"
                 },
@@ -24335,37 +26137,16 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoAssociate": {
-                    "type": "boolean"
-                },
-                "LinkedAccountIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "LinkedAccountIds"
-            ],
-            "type": "object"
-        },
-        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+        "AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem": {
             "additionalProperties": false,
             "properties": {
-                "PricingPlanArn": {
+                "FlowVersion": {
                     "type": "string"
                 }
             },
-            "required": [
-                "PricingPlanArn"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem": {
+        "AWS::Bedrock::FlowVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24400,40 +26181,21 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountId": {
-                            "type": "string"
-                        },
-                        "BillingGroupArn": {
-                            "type": "string"
-                        },
-                        "BillingPeriodRange": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
-                        },
-                        "CustomLineItemChargeDetails": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
                     "required": [
-                        "BillingGroupArn",
-                        "Name"
+                        "FlowArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::CustomLineItem"
+                        "AWS::Bedrock::FlowVersion"
                     ],
                     "type": "string"
                 },
@@ -24452,557 +26214,486 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+        "AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ExclusiveEndBillingPeriod": {
-                    "type": "string"
-                },
-                "InclusiveStartBillingPeriod": {
+                "AgentAliasArn": {
                     "type": "string"
                 }
             },
-            "type": "object"
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+        "AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Flat": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
-                },
-                "LineItemFilters": {
+                "Conditions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowCondition"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
                 },
-                "Percentage": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnectionConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
                 },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
+                "Name",
+                "Source",
+                "Target",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ChargeValue": {
-                    "type": "number"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration"
+                },
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
+                    "type": "string"
+                },
+                "TargetInput": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ChargeValue"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ChildAssociatedResources": {
+                "Connections": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnection"
                     },
                     "type": "array"
                 },
-                "PercentageValue": {
-                    "type": "number"
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNode"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "PercentageValue"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+        "AWS::Bedrock::FlowVersion.FlowNode": {
             "additionalProperties": false,
             "properties": {
-                "Attribute": {
-                    "type": "string"
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeConfiguration"
                 },
-                "MatchOption": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Values": {
+                "Outputs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeOutput"
                     },
                     "type": "array"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Attribute",
-                "MatchOption",
-                "Values"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingPlan": {
+        "AWS::Bedrock::FlowVersion.FlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Collector": {
+                    "type": "object"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration"
                 },
-                "Metadata": {
+                "Input": {
                     "type": "object"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "PricingRuleArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name"
-                    ],
+                "Iterator": {
                     "type": "object"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingPlan"
-                    ],
-                    "type": "string"
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule": {
+        "AWS::Bedrock::FlowVersion.FlowNodeInput": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Name": {
                     "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": {
-                        "BillingEntity": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ModifierPercentage": {
-                            "type": "number"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Operation": {
-                            "type": "string"
-                        },
-                        "Scope": {
-                            "type": "string"
-                        },
-                        "Service": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Tiering": {
-                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "UsageType": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "Scope",
-                        "Type"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingRule"
-                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowNodeOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.FreeTier": {
+        "AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Activated": {
-                    "type": "boolean"
+                "KnowledgeBaseId": {
+                    "type": "string"
+                },
+                "ModelId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Activated"
+                "KnowledgeBaseId"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.Tiering": {
+        "AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FreeTier": {
-                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
+                "LambdaArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "LambdaArn"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::Budget": {
+        "AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration": {
             "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": {
-                        "Budget": {
-                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
-                        },
-                        "NotificationsWithSubscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Budget"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Budgets::Budget"
-                    ],
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "LocaleId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "BotAliasArn",
+                "LocaleId"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.AutoAdjustData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustType": {
-                    "type": "string"
-                },
-                "HistoricalOptions": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration"
                 }
             },
             "required": [
-                "AutoAdjustType"
+                "SourceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.BudgetData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustData": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
-                },
-                "BudgetLimit": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
-                },
-                "BudgetName": {
-                    "type": "string"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInferenceConfiguration"
                 },
-                "BudgetType": {
+                "ModelId": {
                     "type": "string"
                 },
-                "CostFilters": {
-                    "type": "object"
-                },
-                "CostTypes": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
-                },
-                "PlannedBudgetLimits": {
-                    "type": "object"
-                },
-                "TimePeriod": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptTemplateConfiguration"
                 },
-                "TimeUnit": {
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "BudgetType",
-                "TimeUnit"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.CostTypes": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "IncludeCredit": {
-                    "type": "boolean"
-                },
-                "IncludeDiscount": {
-                    "type": "boolean"
-                },
-                "IncludeOtherSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeRecurring": {
-                    "type": "boolean"
-                },
-                "IncludeRefund": {
-                    "type": "boolean"
-                },
-                "IncludeSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeSupport": {
-                    "type": "boolean"
-                },
-                "IncludeTax": {
-                    "type": "boolean"
-                },
-                "IncludeUpfront": {
-                    "type": "boolean"
-                },
-                "UseAmortized": {
-                    "type": "boolean"
+                "PromptArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration"
                 },
-                "UseBlended": {
-                    "type": "boolean"
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration"
                 }
             },
             "type": "object"
         },
-        "AWS::Budgets::Budget.HistoricalOptions": {
+        "AWS::Bedrock::FlowVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BudgetAdjustmentPeriod": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "BudgetAdjustmentPeriod"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Notification": {
+        "AWS::Bedrock::FlowVersion.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "ComparisonOperator": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "NotificationType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Threshold": {
+                "Temperature": {
                     "type": "number"
                 },
-                "ThresholdType": {
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ComparisonOperator",
-                "NotificationType",
-                "Threshold"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Notification": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
-                },
-                "Subscribers": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
-                    },
-                    "type": "array"
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Notification",
-                "Subscribers"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Spend": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Amount": {
-                    "type": "number"
-                },
-                "Unit": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Amount",
-                "Unit"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Subscriber": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "SubscriptionType": {
-                    "type": "string"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Address",
-                "SubscriptionType"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.TimePeriod": {
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "End": {
+                "BucketName": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInputVariable"
+                    },
+                    "type": "array"
                 },
-                "Start": {
+                "Text": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Text"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction": {
+        "AWS::Bedrock::Guardrail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25037,48 +26728,53 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionThreshold": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
-                        },
-                        "ActionType": {
+                        "BlockedInputMessaging": {
                             "type": "string"
                         },
-                        "ApprovalModel": {
+                        "BlockedOutputsMessaging": {
                             "type": "string"
                         },
-                        "BudgetName": {
-                            "type": "string"
+                        "ContentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
                         },
-                        "Definition": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        "ContextualGroundingPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig"
                         },
-                        "ExecutionRoleArn": {
+                        "Description": {
                             "type": "string"
                         },
-                        "NotificationType": {
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Subscribers": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SensitiveInformationPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
+                        },
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TopicPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        },
+                        "WordPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
                         }
                     },
                     "required": [
-                        "ActionThreshold",
-                        "ActionType",
-                        "BudgetName",
-                        "Definition",
-                        "ExecutionRoleArn",
-                        "NotificationType",
-                        "Subscribers"
+                        "BlockedInputMessaging",
+                        "BlockedOutputsMessaging",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Budgets::BudgetsAction"
+                        "AWS::Bedrock::Guardrail"
                     ],
                     "type": "string"
                 },
@@ -25097,113 +26793,88 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "InputStrength": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "number"
+                "OutputStrength": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Value"
+                "InputStrength",
+                "OutputStrength",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Definition": {
+        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "IamActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
-                },
-                "ScpActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
-                },
-                "SsmActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                "FiltersConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "FiltersConfig"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Groups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Threshold": {
+                    "type": "number"
                 },
-                "PolicyArn": {
+                "Type": {
                     "type": "string"
-                },
-                "Roles": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Users": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
             "required": [
-                "PolicyArn"
+                "Threshold",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "PolicyId": {
-                    "type": "string"
-                },
-                "TargetIds": {
+                "FiltersConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PolicyId",
-                "TargetIds"
+                "FiltersConfig"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "Subtype": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InstanceIds",
-                "Region",
-                "Subtype"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Subscriber": {
+        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
+                "Action": {
                     "type": "string"
                 },
                 "Type": {
@@ -25211,239 +26882,124 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Address",
+                "Action",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor": {
+        "AWS::Bedrock::Guardrail.RegexConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Action": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Description": {
                     "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": {
-                        "MonitorDimension": {
-                            "type": "string"
-                        },
-                        "MonitorName": {
-                            "type": "string"
-                        },
-                        "MonitorSpecification": {
-                            "type": "string"
-                        },
-                        "MonitorType": {
-                            "type": "string"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "MonitorName",
-                        "MonitorType"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalyMonitor"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Pattern": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Action",
+                "Name",
+                "Pattern"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor.ResourceTag": {
+        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
+                "PiiEntitiesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                    },
+                    "type": "array"
                 },
-                "Value": {
-                    "type": "string"
+                "RegexesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription": {
+        "AWS::Bedrock::Guardrail.TopicConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Definition": {
                     "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": {
-                        "Frequency": {
-                            "type": "string"
-                        },
-                        "MonitorArnList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
-                            },
-                            "type": "array"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
-                            },
-                            "type": "array"
-                        },
-                        "SubscriptionName": {
-                            "type": "string"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdExpression": {
-                            "type": "string"
-                        }
+                "Examples": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Frequency",
-                        "MonitorArnList",
-                        "Subscribers",
-                        "SubscriptionName"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalySubscription"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Definition",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.ResourceTag": {
+        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "TopicsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "TopicsConfig"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.Subscriber": {
+        "AWS::Bedrock::Guardrail.WordConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "Status": {
-                    "type": "string"
-                },
-                "Type": {
+                "Text": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::CE::CostCategory": {
+        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ManagedWordListsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                    },
+                    "type": "array"
+                },
+                "WordsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::GuardrailVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25478,32 +27034,21 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultValue": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RuleVersion": {
-                            "type": "string"
-                        },
-                        "Rules": {
+                        "Description": {
                             "type": "string"
                         },
-                        "SplitChargeRules": {
+                        "GuardrailIdentifier": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RuleVersion",
-                        "Rules"
+                        "GuardrailIdentifier"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CE::CostCategory"
+                        "AWS::Bedrock::GuardrailVersion"
                     ],
                     "type": "string"
                 },
@@ -25522,7 +27067,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CUR::ReportDefinition": {
+        "AWS::Bedrock::KnowledgeBase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25557,65 +27102,42 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalArtifacts": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AdditionalSchemaElements": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BillingViewArn": {
-                            "type": "string"
-                        },
-                        "Compression": {
-                            "type": "string"
-                        },
-                        "Format": {
-                            "type": "string"
-                        },
-                        "RefreshClosedReports": {
-                            "type": "boolean"
-                        },
-                        "ReportName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ReportVersioning": {
-                            "type": "string"
+                        "KnowledgeBaseConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
                         },
-                        "S3Bucket": {
+                        "Name": {
                             "type": "string"
                         },
-                        "S3Prefix": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "S3Region": {
-                            "type": "string"
+                        "StorageConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
                         },
-                        "TimeUnit": {
-                            "type": "string"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "Compression",
-                        "Format",
-                        "RefreshClosedReports",
-                        "ReportName",
-                        "ReportVersioning",
-                        "S3Bucket",
-                        "S3Prefix",
-                        "S3Region",
-                        "TimeUnit"
+                        "KnowledgeBaseConfiguration",
+                        "Name",
+                        "RoleArn",
+                        "StorageConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CUR::ReportDefinition"
+                        "AWS::Bedrock::KnowledgeBase"
                     ],
                     "type": "string"
                 },
@@ -25634,92 +27156,266 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace": {
+        "AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Dimensions": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockEmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "VectorKnowledgeBaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                }
+            },
+            "required": [
+                "Type",
+                "VectorKnowledgeBaseConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionName": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "CredentialsSecretArn": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "KeyspaceName": {
-                            "type": "string"
-                        },
-                        "ReplicationSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "type": "object"
+                "Endpoint": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Cassandra::Keyspace"
-                    ],
+                "EndpointServiceName": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping"
+                },
+                "VectorIndexName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "CollectionName",
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "Endpoint",
+                "FieldMapping",
+                "VectorIndexName"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "RegionList": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "MetadataField": {
+                    "type": "string"
                 },
-                "ReplicationStrategy": {
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
                     "type": "string"
                 }
             },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                },
+                "VectorIndexName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionArn",
+                "FieldMapping",
+                "VectorIndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionString": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectionString",
+                "CredentialsSecretArn",
+                "FieldMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "FieldMapping",
+                "ResourceArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "PrimaryKeyField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "PrimaryKeyField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MongoDbAtlasConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration"
+                },
+                "OpensearchServerlessConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
+                },
+                "PineconeConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                },
+                "RdsConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EmbeddingModelArn": {
+                    "type": "string"
+                },
+                "EmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration"
+                }
+            },
+            "required": [
+                "EmbeddingModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Prompt": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25754,70 +27450,42 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoScalingSpecifications": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
-                        },
-                        "BillingMode": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
-                        },
-                        "ClientSideTimestampsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ClusteringKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
-                            },
-                            "type": "array"
-                        },
-                        "DefaultTimeToLive": {
-                            "type": "number"
-                        },
-                        "EncryptionSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
-                        },
-                        "KeyspaceName": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "PartitionKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
-                        },
-                        "PointInTimeRecoveryEnabled": {
-                            "type": "boolean"
-                        },
-                        "RegularColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
+                        "DefaultVariant": {
+                            "type": "string"
                         },
-                        "ReplicaSpecifications": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
                         },
-                        "TableName": {
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptVariant"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "KeyspaceName",
-                        "PartitionKeyColumns"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cassandra::Table"
+                        "AWS::Bedrock::Prompt"
                     ],
                     "type": "string"
                 },
@@ -25836,162 +27504,126 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.AutoScalingSetting": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoScalingDisabled": {
-                    "type": "boolean"
-                },
-                "MaximumUnits": {
-                    "type": "number"
-                },
-                "MinimumUnits": {
-                    "type": "number"
-                },
-                "ScalingPolicy": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.AutoScalingSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                },
-                "WriteCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.BillingMode": {
+        "AWS::Bedrock::Prompt.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Mode": {
-                    "type": "string"
-                },
-                "ProvisionedThroughput": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "Mode"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+        "AWS::Bedrock::Prompt.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "Column": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                },
-                "OrderBy": {
+                "Name": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Column"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.Column": {
+        "AWS::Bedrock::Prompt.PromptModelInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "ColumnType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnType"
-            ],
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.EncryptionSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "EncryptionType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "KmsKeyIdentifier": {
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "EncryptionType"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ProvisionedThroughput": {
+        "AWS::Bedrock::Prompt.PromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityUnits": {
-                    "type": "number"
-                },
-                "WriteCapacityUnits": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ReadCapacityUnits",
-                "WriteCapacityUnits"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ReplicaSpecification": {
+        "AWS::Bedrock::Prompt.PromptVariant": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInferenceConfiguration"
                 },
-                "ReadCapacityUnits": {
-                    "type": "number"
+                "ModelId": {
+                    "type": "string"
                 },
-                "Region": {
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Region"
+                "Name",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ScalingPolicy": {
+        "AWS::Bedrock::Prompt.TextPromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "TargetTrackingScalingPolicyConfiguration": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextS3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextS3Location"
                 }
             },
             "type": "object"
         },
-        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+        "AWS::Bedrock::Prompt.TextS3Location": {
             "additionalProperties": false,
             "properties": {
-                "DisableScaleIn": {
-                    "type": "boolean"
-                },
-                "ScaleInCooldown": {
-                    "type": "number"
+                "Bucket": {
+                    "type": "string"
                 },
-                "ScaleOutCooldown": {
-                    "type": "number"
+                "Key": {
+                    "type": "string"
                 },
-                "TargetValue": {
-                    "type": "number"
+                "Version": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TargetValue"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account": {
+        "AWS::Bedrock::PromptVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26026,18 +27658,30 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExpiryEventsConfiguration": {
-                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PromptArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "ExpiryEventsConfiguration"
+                        "PromptArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Account"
+                        "AWS::Bedrock::PromptVersion"
                     ],
                     "type": "string"
                 },
@@ -26056,16 +27700,107 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+        "AWS::Bedrock::PromptVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "DaysBeforeExpiry": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                },
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
                     "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate": {
+        "AWS::Bedrock::PromptVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInferenceConfiguration"
+                },
+                "ModelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "TemplateType"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26100,48 +27835,39 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CertificateAuthorityArn": {
-                            "type": "string"
+                        "AccountGrouping": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
                         },
-                        "CertificateTransparencyLoggingPreference": {
-                            "type": "string"
+                        "ComputationPreference": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
                         },
-                        "DomainName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "DomainValidationOptions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
-                            },
-                            "type": "array"
-                        },
-                        "KeyAlgorithm": {
+                        "Name": {
                             "type": "string"
                         },
-                        "SubjectAlternativeNames": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "PrimaryAccountId": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ValidationMethod": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "AccountGrouping",
+                        "ComputationPreference",
+                        "Name",
+                        "PrimaryAccountId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Certificate"
+                        "AWS::BillingConductor::BillingGroup"
                     ],
                     "type": "string"
                 },
@@ -26160,25 +27886,37 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "HostedZoneId": {
-                    "type": "string"
+                "AutoAssociate": {
+                    "type": "boolean"
                 },
-                "ValidationDomain": {
+                "LinkedAccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LinkedAccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "PricingPlanArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "DomainName"
+                "PricingPlanArn"
             ],
             "type": "object"
         },
-        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26213,52 +27951,40 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
-                            "type": "string"
-                        },
-                        "GuardrailPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "IamRoleArn": {
+                        "AccountId": {
                             "type": "string"
                         },
-                        "LoggingLevel": {
+                        "BillingGroupArn": {
                             "type": "string"
                         },
-                        "SnsTopicArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "BillingPeriodRange": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
                         },
-                        "TeamId": {
-                            "type": "string"
+                        "CustomLineItemChargeDetails": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
                         },
-                        "TeamsChannelId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TeamsTenantId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "UserRoleRequired": {
-                            "type": "boolean"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "TeamId",
-                        "TeamsChannelId",
-                        "TeamsTenantId"
+                        "BillingGroupArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
+                        "AWS::BillingConductor::CustomLineItem"
                     ],
                     "type": "string"
                 },
@@ -26277,7 +28003,96 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Chatbot::SlackChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+            "additionalProperties": false,
+            "properties": {
+                "ExclusiveEndBillingPeriod": {
+                    "type": "string"
+                },
+                "InclusiveStartBillingPeriod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Flat": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
+                },
+                "LineItemFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                    },
+                    "type": "array"
+                },
+                "Percentage": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChargeValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChargeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssociatedResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PercentageValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "PercentageValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MatchOption": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attribute",
+                "MatchOption",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::PricingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26312,48 +28127,33 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "GuardrailPolicies": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PricingRuleArns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "IamRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingLevel": {
-                            "type": "string"
-                        },
-                        "SlackChannelId": {
-                            "type": "string"
-                        },
-                        "SlackWorkspaceId": {
-                            "type": "string"
-                        },
-                        "SnsTopicArns": {
+                        "Tags": {
                             "items": {
-                                "type": "string"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserRoleRequired": {
-                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "SlackChannelId",
-                        "SlackWorkspaceId"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::SlackChannelConfiguration"
+                        "AWS::BillingConductor::PricingPlan"
                     ],
                     "type": "string"
                 },
@@ -26372,7 +28172,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate": {
+        "AWS::BillingConductor::PricingRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26407,45 +28207,53 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AnalysisParameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
-                            },
-                            "type": "array"
+                        "BillingEntity": {
+                            "type": "string"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "Format": {
+                        "ModifierPercentage": {
+                            "type": "number"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Operation": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Scope": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        "Service": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Tiering": {
+                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UsageType": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "MembershipIdentifier",
                         "Name",
-                        "Source"
+                        "Scope",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::AnalysisTemplate"
+                        "AWS::BillingConductor::PricingRule"
                     ],
                     "type": "string"
                 },
@@ -26464,53 +28272,28 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
-            "additionalProperties": false,
-            "properties": {
-                "DefaultValue": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+        "AWS::BillingConductor::PricingRule.FreeTier": {
             "additionalProperties": false,
             "properties": {
-                "ReferencedTables": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Activated": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "ReferencedTables"
+                "Activated"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+        "AWS::BillingConductor::PricingRule.Tiering": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
-                    "type": "string"
+                "FreeTier": {
+                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
                 }
             },
-            "required": [
-                "Text"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration": {
+        "AWS::Budgets::Budget": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26545,56 +28328,30 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CreatorDisplayName": {
-                            "type": "string"
-                        },
-                        "CreatorMemberAbilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "CreatorPaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
-                        },
-                        "DataEncryptionMetadata": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
-                        },
-                        "Description": {
-                            "type": "string"
+                        "Budget": {
+                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
                         },
-                        "Members": {
+                        "NotificationsWithSubscribers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
                             },
                             "type": "array"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "CreatorDisplayName",
-                        "CreatorMemberAbilities",
-                        "Description",
-                        "Members",
-                        "Name",
-                        "QueryLogStatus"
+                        "Budget"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Collaboration"
+                        "AWS::Budgets::Budget"
                     ],
                     "type": "string"
                 },
@@ -26613,89 +28370,219 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+        "AWS::Budgets::Budget.AutoAdjustData": {
             "additionalProperties": false,
             "properties": {
-                "AllowCleartext": {
-                    "type": "boolean"
-                },
-                "AllowDuplicates": {
-                    "type": "boolean"
-                },
-                "AllowJoinsOnColumnsWithDifferentNames": {
-                    "type": "boolean"
+                "AutoAdjustType": {
+                    "type": "string"
                 },
-                "PreserveNulls": {
-                    "type": "boolean"
+                "HistoricalOptions": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
                 }
             },
             "required": [
-                "AllowCleartext",
-                "AllowDuplicates",
-                "AllowJoinsOnColumnsWithDifferentNames",
-                "PreserveNulls"
+                "AutoAdjustType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+        "AWS::Budgets::Budget.BudgetData": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "AutoAdjustData": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
+                },
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
                     "type": "string"
                 },
-                "DisplayName": {
+                "BudgetType": {
                     "type": "string"
                 },
-                "MemberAbilities": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "CostFilters": {
+                    "type": "object"
                 },
-                "PaymentConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AccountId",
-                "DisplayName",
-                "MemberAbilities"
+                "BudgetType",
+                "TimeUnit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+        "AWS::Budgets::Budget.CostTypes": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                "IncludeCredit": {
+                    "type": "boolean"
+                },
+                "IncludeDiscount": {
+                    "type": "boolean"
+                },
+                "IncludeOtherSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeRecurring": {
+                    "type": "boolean"
+                },
+                "IncludeRefund": {
+                    "type": "boolean"
+                },
+                "IncludeSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeSupport": {
+                    "type": "boolean"
+                },
+                "IncludeTax": {
+                    "type": "boolean"
+                },
+                "IncludeUpfront": {
+                    "type": "boolean"
+                },
+                "UseAmortized": {
+                    "type": "boolean"
+                },
+                "UseBlended": {
+                    "type": "boolean"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+        "AWS::Budgets::Budget.HistoricalOptions": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "BudgetAdjustmentPeriod": {
+                    "type": "number"
                 }
             },
             "required": [
-                "IsResponsible"
+                "BudgetAdjustmentPeriod"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable": {
+        "AWS::Budgets::Budget.Notification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ComparisonOperator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
+                "NotificationType": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "ThresholdType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "NotificationType",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+            "additionalProperties": false,
+            "properties": {
+                "Notification": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
+                },
+                "Subscribers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Notification",
+                "Subscribers"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Spend": {
+            "additionalProperties": false,
+            "properties": {
+                "Amount": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Amount",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "SubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "SubscriptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.TimePeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
                         "Retain",
                         "Snapshot"
                     ],
@@ -26722,48 +28609,54 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowedColumns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
                         },
-                        "AnalysisMethod": {
+                        "ActionType": {
                             "type": "string"
                         },
-                        "AnalysisRules": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
-                            },
-                            "type": "array"
+                        "ApprovalModel": {
+                            "type": "string"
                         },
-                        "Description": {
+                        "BudgetName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "TableReference": {
-                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        "NotificationType": {
+                            "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "AllowedColumns",
-                        "AnalysisMethod",
-                        "Name",
-                        "TableReference"
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTable"
+                        "AWS::Budgets::BudgetsAction"
                     ],
                     "type": "string"
                 },
@@ -26782,98 +28675,56 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "ColumnNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Function": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnNames",
-                "Function"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Type": {
                     "type": "string"
                 },
-                "Minimum": {
+                "Value": {
                     "type": "number"
-                },
-                "Type": {
-                    "type": "string"
                 }
             },
             "required": [
-                "ColumnName",
-                "Minimum",
-                "Type"
+                "Type",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+        "AWS::Budgets::BudgetsAction.Definition": {
             "additionalProperties": false,
             "properties": {
-                "Policy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
                 },
-                "Type": {
-                    "type": "string"
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
                 }
             },
-            "required": [
-                "Policy",
-                "Type"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AggregateColumns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
-                    },
-                    "type": "array"
-                },
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DimensionColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
+                "Groups": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "JoinRequired": {
+                "PolicyArn": {
                     "type": "string"
                 },
-                "OutputConstraints": {
+                "Roles": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "ScalarFunctions": {
+                "Users": {
                     "items": {
                         "type": "string"
                     },
@@ -26881,54 +28732,33 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "AggregateColumns",
-                "DimensionColumns",
-                "JoinColumns",
-                "OutputConstraints",
-                "ScalarFunctions"
+                "PolicyArn"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+        "AWS::Budgets::BudgetsAction.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "AllowedAnalyses": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AllowedAnalysisProviders": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
                 },
-                "DifferentialPrivacy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AllowedAnalyses"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "PolicyId": {
+                    "type": "string"
                 },
-                "ListColumns": {
+                "TargetIds": {
                     "items": {
                         "type": "string"
                     },
@@ -26936,94 +28766,51 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "JoinColumns",
-                "ListColumns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "V1": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
-                }
-            },
-            "required": [
-                "V1"
+                "PolicyId",
+                "TargetIds"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
-            "additionalProperties": false,
-            "properties": {
-                "Aggregation": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
-                },
-                "Custom": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
-                },
-                "List": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Columns": {
+                "InstanceIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "Columns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "Name": {
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name"
+                "InstanceIds",
+                "Region",
+                "Subtype"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+        "AWS::Budgets::BudgetsAction.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "DatabaseName": {
+                "Address": {
                     "type": "string"
                 },
-                "TableName": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "DatabaseName",
-                "TableName"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.TableReference": {
-            "additionalProperties": false,
-            "properties": {
-                "Glue": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
-                }
-            },
-            "required": [
-                "Glue"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTableAssociation": {
+        "AWS::CE::AnomalyMonitor": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27058,39 +28845,34 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfiguredTableIdentifier": {
-                            "type": "string"
-                        },
-                        "Description": {
+                        "MonitorDimension": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "MonitorName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "MonitorSpecification": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "MonitorType": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "ConfiguredTableIdentifier",
-                        "MembershipIdentifier",
-                        "Name",
-                        "RoleArn"
+                        "MonitorName",
+                        "MonitorType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTableAssociation"
+                        "AWS::CE::AnomalyMonitor"
                     ],
                     "type": "string"
                 },
@@ -27109,7 +28891,23 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership": {
+        "AWS::CE::AnomalyMonitor.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27144,34 +28942,48 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CollaborationIdentifier": {
+                        "Frequency": {
                             "type": "string"
                         },
-                        "DefaultResultConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
-                        },
-                        "PaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
+                        "MonitorArnList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "QueryLogStatus": {
-                            "type": "string"
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
+                            },
+                            "type": "array"
                         },
-                        "Tags": {
+                        "Subscribers": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
                             },
                             "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdExpression": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CollaborationIdentifier",
-                        "QueryLogStatus"
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Membership"
+                        "AWS::CE::AnomalySubscription"
                     ],
                     "type": "string"
                 },
@@ -27190,77 +29002,42 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
-                }
-            },
-            "required": [
-                "QueryCompute"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
-                }
-            },
-            "required": [
-                "S3"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+        "AWS::CE::AnomalySubscription.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "OutputConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "RoleArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "OutputConfiguration"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "IsResponsible"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+        "AWS::CE::AnomalySubscription.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "Address": {
                     "type": "string"
                 },
-                "KeyPrefix": {
+                "Status": {
                     "type": "string"
                 },
-                "ResultFormat": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "ResultFormat"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate": {
+        "AWS::CE::CostCategory": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27295,36 +29072,32 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoRefresh": {
+                        "DefaultValue": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Parameters": {
-                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        "RuleVersion": {
+                            "type": "string"
                         },
-                        "PrivacyBudgetType": {
+                        "Rules": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "SplitChargeRules": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AutoRefresh",
-                        "MembershipIdentifier",
-                        "Parameters",
-                        "PrivacyBudgetType"
+                        "Name",
+                        "RuleVersion",
+                        "Rules"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::PrivacyBudgetTemplate"
+                        "AWS::CE::CostCategory"
                     ],
                     "type": "string"
                 },
@@ -27343,23 +29116,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
-            "additionalProperties": false,
-            "properties": {
-                "Epsilon": {
-                    "type": "number"
-                },
-                "UsersNoisePerQuery": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Epsilon",
-                "UsersNoisePerQuery"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset": {
+        "AWS::CUR::ReportDefinition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27394,38 +29151,65 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "AdditionalArtifacts": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "TrainingData": {
+                        "AdditionalSchemaElements": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "BillingViewArn": {
+                            "type": "string"
+                        },
+                        "Compression": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "RefreshClosedReports": {
+                            "type": "boolean"
+                        },
+                        "ReportName": {
+                            "type": "string"
+                        },
+                        "ReportVersioning": {
+                            "type": "string"
+                        },
+                        "S3Bucket": {
+                            "type": "string"
+                        },
+                        "S3Prefix": {
+                            "type": "string"
+                        },
+                        "S3Region": {
+                            "type": "string"
+                        },
+                        "TimeUnit": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RoleArn",
-                        "TrainingData"
+                        "Compression",
+                        "Format",
+                        "RefreshClosedReports",
+                        "ReportName",
+                        "ReportVersioning",
+                        "S3Bucket",
+                        "S3Prefix",
+                        "S3Region",
+                        "TimeUnit"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRoomsML::TrainingDataset"
+                        "AWS::CUR::ReportDefinition"
                     ],
                     "type": "string"
                 },
@@ -27444,92 +29228,92 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
+        "AWS::Cassandra::Keyspace": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Condition": {
                     "type": "string"
                 },
-                "ColumnTypes": {
-                    "items": {
-                        "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": {
+                        "KeyspaceName": {
+                            "type": "string"
+                        },
+                        "ReplicationSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
                     },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnTypes"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "GlueDataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
-                }
-            },
-            "required": [
-                "GlueDataSource"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
-            "additionalProperties": false,
-            "properties": {
-                "InputConfig": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "InputConfig",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
+        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
             "additionalProperties": false,
             "properties": {
-                "DataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
-                },
-                "Schema": {
+                "RegionList": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "DataSource",
-                "Schema"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "CatalogId": {
-                    "type": "string"
-                },
-                "DatabaseName": {
-                    "type": "string"
                 },
-                "TableName": {
+                "ReplicationStrategy": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DatabaseName",
-                "TableName"
-            ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2": {
+        "AWS::Cassandra::Table": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27564,34 +29348,52 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutomaticStopTimeMinutes": {
-                            "type": "number"
+                        "AutoScalingSpecifications": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
                         },
-                        "ConnectionType": {
-                            "type": "string"
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
                         },
-                        "Description": {
-                            "type": "string"
+                        "ClientSideTimestampsEnabled": {
+                            "type": "boolean"
                         },
-                        "ImageId": {
-                            "type": "string"
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
                         },
-                        "InstanceType": {
-                            "type": "string"
+                        "DefaultTimeToLive": {
+                            "type": "number"
                         },
-                        "Name": {
-                            "type": "string"
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
                         },
-                        "OwnerArn": {
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "Repositories": {
+                        "PartitionKeyColumns": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
                             },
                             "type": "array"
                         },
-                        "SubnetId": {
+                        "PointInTimeRecoveryEnabled": {
+                            "type": "boolean"
+                        },
+                        "RegularColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "ReplicaSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TableName": {
                             "type": "string"
                         },
                         "Tags": {
@@ -27602,14 +29404,14 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "ImageId",
-                        "InstanceType"
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cloud9::EnvironmentEC2"
+                        "AWS::Cassandra::Table"
                     ],
                     "type": "string"
                 },
@@ -27628,23 +29430,162 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2.Repository": {
+        "AWS::Cassandra::Table.AutoScalingSetting": {
             "additionalProperties": false,
             "properties": {
-                "PathComponent": {
+                "AutoScalingDisabled": {
+                    "type": "boolean"
+                },
+                "MaximumUnits": {
+                    "type": "number"
+                },
+                "MinimumUnits": {
+                    "type": "number"
+                },
+                "ScalingPolicy": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.AutoScalingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "WriteCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.BillingMode": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
                     "type": "string"
                 },
-                "RepositoryUrl": {
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                },
+                "OrderBy": {
                     "type": "string"
                 }
             },
             "required": [
-                "PathComponent",
-                "RepositoryUrl"
+                "Column"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::CustomResource": {
+        "AWS::Cassandra::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "ColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "ColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.EncryptionSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKeyIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27679,18 +29620,18 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ServiceToken": {
-                            "type": "string"
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
                         }
                     },
                     "required": [
-                        "ServiceToken"
+                        "ExpiryEventsConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::CustomResource"
+                        "AWS::CertificateManager::Account"
                     ],
                     "type": "string"
                 },
@@ -27709,7 +29650,16 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookDefaultVersion": {
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27744,21 +29694,48 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "CertificateAuthorityArn": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "CertificateTransparencyLoggingPreference": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DomainName"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookDefaultVersion"
+                        "AWS::CertificateManager::Certificate"
                     ],
                     "type": "string"
                 },
@@ -27772,11 +29749,30 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookTypeConfig": {
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27811,27 +29807,58 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "ConfigurationAlias": {
-                            "type": "string"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "TypeArn": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
                             "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Configuration"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TeamsChannelId": {
+                            "type": "string"
+                        },
+                        "TeamsTenantId": {
+                            "type": "string"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "TeamId",
+                        "TeamsChannelId",
+                        "TeamsTenantId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookTypeConfig"
+                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27850,7 +29877,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion": {
+        "AWS::Chatbot::SlackChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27885,28 +29912,54 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "SchemaHandlerPackage": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
                             "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookVersion"
+                        "AWS::Chatbot::SlackChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27925,19 +29978,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion.LoggingConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "LogGroupName": {
-                    "type": "string"
-                },
-                "LogRoleArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFormation::Macro": {
+        "AWS::CleanRooms::AnalysisTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27972,31 +30013,45 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "AnalysisParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
+                            },
+                            "type": "array"
                         },
-                        "FunctionName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "LogGroupName": {
+                        "Format": {
                             "type": "string"
                         },
-                        "LogRoleARN": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "FunctionName",
-                        "Name"
+                        "Format",
+                        "MembershipIdentifier",
+                        "Name",
+                        "Source"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Macro"
+                        "AWS::CleanRooms::AnalysisTemplate"
                     ],
                     "type": "string"
                 },
@@ -28015,7 +30070,53 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleDefaultVersion": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferencedTables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ReferencedTables"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28050,21 +30151,56 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "CreatorDisplayName": {
                             "type": "string"
                         },
-                        "ModuleName": {
+                        "CreatorMemberAbilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CreatorPaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                        },
+                        "DataEncryptionMetadata": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "CreatorDisplayName",
+                        "CreatorMemberAbilities",
+                        "Description",
+                        "Members",
+                        "Name",
+                        "QueryLogStatus"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleDefaultVersion"
+                        "AWS::CleanRooms::Collaboration"
                     ],
                     "type": "string"
                 },
@@ -28078,11 +30214,86 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleVersion": {
+        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCleartext": {
+                    "type": "boolean"
+                },
+                "AllowDuplicates": {
+                    "type": "boolean"
+                },
+                "AllowJoinsOnColumnsWithDifferentNames": {
+                    "type": "boolean"
+                },
+                "PreserveNulls": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowCleartext",
+                "AllowDuplicates",
+                "AllowJoinsOnColumnsWithDifferentNames",
+                "PreserveNulls"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "MemberAbilities": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PaymentConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                }
+            },
+            "required": [
+                "AccountId",
+                "DisplayName",
+                "MemberAbilities"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28117,22 +30328,48 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ModuleName": {
+                        "AllowedColumns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalysisMethod": {
                             "type": "string"
                         },
-                        "ModulePackage": {
+                        "AnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "TableReference": {
+                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ModuleName",
-                        "ModulePackage"
+                        "AllowedColumns",
+                        "AnalysisMethod",
+                        "Name",
+                        "TableReference"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleVersion"
+                        "AWS::CleanRooms::ConfiguredTable"
                     ],
                     "type": "string"
                 },
@@ -28151,7 +30388,263 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::PublicTypeVersion": {
+        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnNames",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Minimum": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Minimum",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AggregateColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
+                    },
+                    "type": "array"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DimensionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinRequired": {
+                    "type": "string"
+                },
+                "OutputConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                    },
+                    "type": "array"
+                },
+                "ScalarFunctions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AggregateColumns",
+                "DimensionColumns",
+                "JoinColumns",
+                "OutputConstraints",
+                "ScalarFunctions"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedAnalysisProviders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DifferentialPrivacy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                },
+                "DisallowedOutputColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AllowedAnalyses"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ListColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "JoinColumns",
+                "ListColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.TableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Glue": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
+                }
+            },
+            "required": [
+                "Glue"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28186,27 +30679,45 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "ConfiguredTableAssociationAnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "ConfiguredTableIdentifier": {
                             "type": "string"
                         },
-                        "LogDeliveryBucket": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicVersionNumber": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ConfiguredTableIdentifier",
+                        "MembershipIdentifier",
+                        "Name",
+                        "RoleArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::PublicTypeVersion"
+                        "AWS::CleanRooms::ConfiguredTableAssociation"
                     ],
                     "type": "string"
                 },
@@ -28220,11 +30731,109 @@ var SamSchema = `{
                 }
             },
             "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::Publisher": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28259,21 +30868,38 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AcceptTermsAndConditions": {
-                            "type": "boolean"
+                        "Description": {
+                            "type": "string"
                         },
-                        "ConnectionArn": {
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "AcceptTermsAndConditions"
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Publisher"
+                        "AWS::CleanRooms::IdMappingTable"
                     ],
                     "type": "string"
                 },
@@ -28292,7 +30918,54 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceDefaultVersion": {
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingTableInputSource": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "IdMappingTableInputSource"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "IdNamespaceAssociationId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdNamespaceAssociationId",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28327,21 +31000,38 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "IdMappingConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig"
+                        },
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig"
+                        },
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceDefaultVersion"
+                        "AWS::CleanRooms::IdNamespaceAssociation"
                     ],
                     "type": "string"
                 },
@@ -28355,11 +31045,55 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion": {
+        "AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowUseAsDimensionColumn": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowUseAsDimensionColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingWorkflowsSupported": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "IdNamespaceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28394,28 +31128,34 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "CollaborationIdentifier": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        "DefaultResultConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
                         },
-                        "SchemaHandlerPackage": {
-                            "type": "string"
+                        "PaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
                         },
-                        "TypeName": {
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "CollaborationIdentifier",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceVersion"
+                        "AWS::CleanRooms::Membership"
                     ],
                     "type": "string"
                 },
@@ -28434,19 +31174,77 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OutputConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "ResultFormat": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Bucket",
+                "ResultFormat"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::Stack": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28481,42 +31279,36 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "NotificationARNs": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "AutoRefresh": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
                         },
                         "Parameters": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
+                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        },
+                        "PrivacyBudgetType": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
-                        },
-                        "TimeoutInMinutes": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "TemplateURL"
+                        "AutoRefresh",
+                        "MembershipIdentifier",
+                        "Parameters",
+                        "PrivacyBudgetType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Stack"
+                        "AWS::CleanRooms::PrivacyBudgetTemplate"
                     ],
                     "type": "string"
                 },
@@ -28535,7 +31327,23 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Epsilon": {
+                    "type": "number"
+                },
+                "UsersNoisePerQuery": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Epsilon",
+                "UsersNoisePerQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRoomsML::TrainingDataset": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28570,73 +31378,38 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdministrationRoleARN": {
-                            "type": "string"
-                        },
-                        "AutoDeployment": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
-                        },
-                        "CallAs": {
-                            "type": "string"
-                        },
-                        "Capabilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "ExecutionRoleName": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ManagedExecution": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
-                        },
-                        "OperationPreferences": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
-                        },
-                        "Parameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                            },
-                            "type": "array"
-                        },
-                        "PermissionModel": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "StackInstancesGroup": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
                         },
-                        "StackSetName": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "TrainingData": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
                             },
                             "type": "array"
-                        },
-                        "TemplateBody": {
-                            "type": "string"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "PermissionModel",
-                        "StackSetName"
+                        "Name",
+                        "RoleArn",
+                        "TrainingData"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::StackSet"
+                        "AWS::CleanRoomsML::TrainingDataset"
                     ],
                     "type": "string"
                 },
@@ -28655,120 +31428,92 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.AutoDeployment": {
+        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "ColumnName": {
+                    "type": "string"
                 },
-                "RetainStacksOnAccountRemoval": {
-                    "type": "boolean"
+                "ColumnTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "ColumnTypes"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
             "additionalProperties": false,
             "properties": {
-                "AccountFilterType": {
-                    "type": "string"
-                },
-                "Accounts": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AccountsUrl": {
-                    "type": "string"
-                },
-                "OrganizationalUnitIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "GlueDataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
                 }
             },
+            "required": [
+                "GlueDataSource"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.ManagedExecution": {
+        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
             "additionalProperties": false,
             "properties": {
-                "Active": {
-                    "type": "boolean"
+                "InputConfig": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "InputConfig",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.OperationPreferences": {
+        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
             "additionalProperties": false,
             "properties": {
-                "FailureToleranceCount": {
-                    "type": "number"
-                },
-                "FailureTolerancePercentage": {
-                    "type": "number"
-                },
-                "MaxConcurrentCount": {
-                    "type": "number"
-                },
-                "MaxConcurrentPercentage": {
-                    "type": "number"
-                },
-                "RegionConcurrencyType": {
-                    "type": "string"
+                "DataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
                 },
-                "RegionOrder": {
+                "Schema": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
                     },
                     "type": "array"
                 }
             },
-            "type": "object"
-        },
-        "AWS::CloudFormation::StackSet.Parameter": {
-            "additionalProperties": false,
-            "properties": {
-                "ParameterKey": {
-                    "type": "string"
-                },
-                "ParameterValue": {
-                    "type": "string"
-                }
-            },
             "required": [
-                "ParameterKey",
-                "ParameterValue"
+                "DataSource",
+                "Schema"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.StackInstances": {
+        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
             "additionalProperties": false,
             "properties": {
-                "DeploymentTargets": {
-                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                "CatalogId": {
+                    "type": "string"
                 },
-                "ParameterOverrides": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                    },
-                    "type": "array"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Regions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "TableName": {
+                    "type": "string"
                 }
             },
             "required": [
-                "DeploymentTargets",
-                "Regions"
+                "DatabaseName",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation": {
+        "AWS::Cloud9::EnvironmentEC2": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28803,42 +31548,52 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoUpdate": {
-                            "type": "boolean"
+                        "AutomaticStopTimeMinutes": {
+                            "type": "number"
                         },
-                        "ExecutionRoleArn": {
+                        "ConnectionType": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
-                        },
-                        "MajorVersion": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicTypeArn": {
+                        "ImageId": {
                             "type": "string"
                         },
-                        "PublisherId": {
+                        "InstanceType": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "OwnerArn": {
                             "type": "string"
                         },
-                        "TypeNameAlias": {
-                            "type": "string"
+                        "Repositories": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                            },
+                            "type": "array"
                         },
-                        "VersionBump": {
+                        "SubnetId": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::TypeActivation"
+                        "AWS::Cloud9::EnvironmentEC2"
                     ],
                     "type": "string"
                 },
@@ -28852,31 +31607,33 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "PathComponent": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "RepositoryUrl": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitCondition": {
+        "AWS::CloudFormation::CustomResource": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
-                "CreationPolicy": {
-                    "type": "object"
-                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -28906,21 +31663,21 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Count": {
+                        "ServiceTimeout": {
                             "type": "number"
                         },
-                        "Handle": {
-                            "type": "string"
-                        },
-                        "Timeout": {
+                        "ServiceToken": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ServiceToken"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitCondition"
+                        "AWS::CloudFormation::CustomResource"
                     ],
                     "type": "string"
                 },
@@ -28934,11 +31691,12 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitConditionHandle": {
+        "AWS::CloudFormation::HookDefaultVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28972,12 +31730,22 @@ var SamSchema = `{
                 },
                 "Properties": {
                     "additionalProperties": false,
-                    "properties": {},
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitConditionHandle"
+                        "AWS::CloudFormation::HookDefaultVersion"
                     ],
                     "type": "string"
                 },
@@ -28995,7 +31763,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy": {
+        "AWS::CloudFormation::HookTypeConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29030,18 +31798,27 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CachePolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "ConfigurationAlias": {
+                            "type": "string"
+                        },
+                        "TypeArn": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CachePolicyConfig"
+                        "Configuration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CachePolicy"
+                        "AWS::CloudFormation::HookTypeConfig"
                     ],
                     "type": "string"
                 },
@@ -29060,119 +31837,239 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+        "AWS::CloudFormation::HookVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "Condition": {
                     "type": "string"
                 },
-                "DefaultTTL": {
-                    "type": "number"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "MaxTTL": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "MinTTL": {
-                    "type": "number"
+                "Metadata": {
+                    "type": "object"
                 },
-                "Name": {
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookVersion"
+                    ],
                     "type": "string"
                 },
-                "ParametersInCacheKeyAndForwardedToOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "DefaultTTL",
-                "MaxTTL",
-                "MinTTL",
-                "Name",
-                "ParametersInCacheKeyAndForwardedToOrigin"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+        "AWS::CloudFormation::HookVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "CookieBehavior": {
+                "LogGroupName": {
                     "type": "string"
                 },
-                "Cookies": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "CookieBehavior"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+        "AWS::CloudFormation::Macro": {
             "additionalProperties": false,
             "properties": {
-                "HeaderBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "HeaderBehavior"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
-            "additionalProperties": false,
-            "properties": {
-                "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "EnableAcceptEncodingBrotli": {
-                    "type": "boolean"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "EnableAcceptEncodingGzip": {
-                    "type": "boolean"
+                "Metadata": {
+                    "type": "object"
                 },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
                 },
-                "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "CookiesConfig",
-                "EnableAcceptEncodingGzip",
-                "HeadersConfig",
-                "QueryStringsConfig"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+        "AWS::CloudFormation::ModuleDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "QueryStringBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "QueryStrings": {
-                    "items": {
-                        "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "QueryStringBehavior"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+        "AWS::CloudFormation::ModuleVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29207,18 +32104,22 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CloudFrontOriginAccessIdentityConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName",
+                        "ModulePackage"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        "AWS::CloudFormation::ModuleVersion"
                     ],
                     "type": "string"
                 },
@@ -29237,19 +32138,80 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+        "AWS::CloudFormation::PublicTypeVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "LogDeliveryBucket": {
+                            "type": "string"
+                        },
+                        "PublicVersionNumber": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::PublicTypeVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Comment"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+        "AWS::CloudFormation::Publisher": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29284,18 +32246,21 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContinuousDeploymentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                        "AWS::CloudFormation::Publisher"
                     ],
                     "type": "string"
                 },
@@ -29314,134 +32279,250 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+        "AWS::CloudFormation::ResourceDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "Condition": {
+                    "type": "string"
                 },
-                "SingleHeaderPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "StagingDistributionDnsNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TrafficConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Enabled",
-                "StagingDistributionDnsNames"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IdleTTL": {
-                    "type": "number"
                 },
-                "MaximumTTL": {
-                    "type": "number"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "IdleTTL",
-                "MaximumTTL"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+        "AWS::CloudFormation::ResourceVersion": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "Condition": {
                     "type": "string"
                 },
-                "Value": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Header",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Header": {
+                },
+                "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": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceVersion"
+                    ],
                     "type": "string"
                 },
-                "Value": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "LogGroupName": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "Weight"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+        "AWS::CloudFormation::Stack": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "Condition": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Weight"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "SingleHeaderConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                "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": {
+                        "NotificationARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "TemplateURL"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution": {
+        "AWS::CloudFormation::StackSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29476,24 +32557,73 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        "AdministrationRoleARN": {
+                            "type": "string"
+                        },
+                        "AutoDeployment": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
+                        },
+                        "CallAs": {
+                            "type": "string"
+                        },
+                        "Capabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleName": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
+                        },
+                        "OperationPreferences": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionModel": {
+                            "type": "string"
+                        },
+                        "StackInstancesGroup": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                            },
+                            "type": "array"
+                        },
+                        "StackSetName": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DistributionConfig"
+                        "PermissionModel",
+                        "StackSetName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Distribution"
+                        "AWS::CloudFormation::StackSet"
                     ],
                     "type": "string"
                 },
@@ -29512,142 +32642,1002 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CacheBehavior": {
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "CachePolicyId": {
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountFilterType": {
                     "type": "string"
                 },
-                "CachedMethods": {
+                "Accounts": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "AccountsUrl": {
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
-                },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
-                },
-                "LambdaFunctionAssociations": {
+                "OrganizationalUnitIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                        "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.ManagedExecution": {
+            "additionalProperties": false,
+            "properties": {
+                "Active": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrencyMode": {
+                    "type": "string"
                 },
-                "MaxTTL": {
+                "FailureToleranceCount": {
                     "type": "number"
                 },
-                "MinTTL": {
+                "FailureTolerancePercentage": {
                     "type": "number"
                 },
-                "OriginRequestPolicyId": {
-                    "type": "string"
-                },
-                "PathPattern": {
-                    "type": "string"
-                },
-                "RealtimeLogConfigArn": {
-                    "type": "string"
-                },
-                "ResponseHeadersPolicyId": {
-                    "type": "string"
+                "MaxConcurrentCount": {
+                    "type": "number"
                 },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                "MaxConcurrentPercentage": {
+                    "type": "number"
                 },
-                "TargetOriginId": {
+                "RegionConcurrencyType": {
                     "type": "string"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TrustedSigners": {
+                "RegionOrder": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
-                },
-                "ViewerProtocolPolicy": {
-                    "type": "string"
                 }
             },
-            "required": [
-                "PathPattern",
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Cookies": {
+        "AWS::CloudFormation::StackSet.Parameter": {
             "additionalProperties": false,
             "properties": {
-                "Forward": {
+                "ParameterKey": {
                     "type": "string"
                 },
-                "WhitelistedNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ParameterValue": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Forward"
+                "ParameterKey",
+                "ParameterValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+        "AWS::CloudFormation::StackSet.StackInstances": {
             "additionalProperties": false,
             "properties": {
-                "ErrorCachingMinTTL": {
-                    "type": "number"
-                },
-                "ErrorCode": {
-                    "type": "number"
+                "DeploymentTargets": {
+                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
                 },
-                "ResponseCode": {
-                    "type": "number"
+                "ParameterOverrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                    },
+                    "type": "array"
                 },
-                "ResponsePagePath": {
-                    "type": "string"
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "ErrorCode"
+                "DeploymentTargets",
+                "Regions"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+        "AWS::CloudFormation::TypeActivation": {
             "additionalProperties": false,
             "properties": {
-                "HTTPPort": {
-                    "type": "number"
+                "Condition": {
+                    "type": "string"
                 },
-                "HTTPSPort": {
-                    "type": "number"
+                "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": {
+                        "AutoUpdate": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
+                        },
+                        "MajorVersion": {
+                            "type": "string"
+                        },
+                        "PublicTypeArn": {
+                            "type": "string"
+                        },
+                        "PublisherId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeNameAlias": {
+                            "type": "string"
+                        },
+                        "VersionBump": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::TypeActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "CreationPolicy": {
+                    "type": "object"
+                },
+                "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": {
+                        "Count": {
+                            "type": "number"
+                        },
+                        "Handle": {
+                            "type": "string"
+                        },
+                        "Timeout": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitCondition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitConditionHandle": {
+            "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": {},
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitConditionHandle"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy": {
+            "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": {
+                        "CachePolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "CachePolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CachePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ParametersInCacheKeyAndForwardedToOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                }
+            },
+            "required": [
+                "DefaultTTL",
+                "MaxTTL",
+                "MinTTL",
+                "Name",
+                "ParametersInCacheKeyAndForwardedToOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
+            "additionalProperties": false,
+            "properties": {
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                },
+                "EnableAcceptEncodingBrotli": {
+                    "type": "boolean"
+                },
+                "EnableAcceptEncodingGzip": {
+                    "type": "boolean"
+                },
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                },
+                "QueryStringsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                }
+            },
+            "required": [
+                "CookiesConfig",
+                "EnableAcceptEncodingGzip",
+                "HeadersConfig",
+                "QueryStringsConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+            "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": {
+                        "CloudFrontOriginAccessIdentityConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        }
+                    },
+                    "required": [
+                        "CloudFrontOriginAccessIdentityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+            "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": {
+                        "ContinuousDeploymentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ContinuousDeploymentPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SingleHeaderPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                },
+                "SingleWeightPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                },
+                "StagingDistributionDnsNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrafficConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "StagingDistributionDnsNames"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTTL": {
+                    "type": "number"
+                },
+                "MaximumTTL": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTTL",
+                "MaximumTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SingleHeaderConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                },
+                "SingleWeightConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution": {
+            "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": {
+                        "DistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DistributionConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Distribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CacheBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "PathPattern": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathPattern",
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Cookies": {
+            "additionalProperties": false,
+            "properties": {
+                "Forward": {
+                    "type": "string"
+                },
+                "WhitelistedNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Forward"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorCachingMinTTL": {
+                    "type": "number"
+                },
+                "ErrorCode": {
+                    "type": "number"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponsePagePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ErrorCode"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HTTPPort": {
+                    "type": "number"
+                },
+                "HTTPSPort": {
+                    "type": "number"
                 },
                 "OriginKeepaliveTimeout": {
                     "type": "number"
@@ -33413,9 +37403,21 @@ var SamSchema = `{
                         "EnvironmentType": {
                             "type": "string"
                         },
+                        "FleetServiceRole": {
+                            "type": "string"
+                        },
+                        "FleetVpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Fleet.VpcConfig"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "OverflowBehavior": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -33445,6 +37447,27 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodeBuild::Project": {
             "additionalProperties": false,
             "properties": {
@@ -33872,6 +37895,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "ScopeConfiguration": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.ScopeConfiguration"
+                },
                 "Webhook": {
                     "type": "boolean"
                 }
@@ -33912,6 +37938,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Project.ScopeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
         "AWS::CodeBuild::Project.Source": {
             "additionalProperties": false,
             "properties": {
@@ -35757,6 +39795,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.BeforeEntryConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35773,6 +39823,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Result": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleDeclaration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.EncryptionKey": {
             "additionalProperties": false,
             "properties": {
@@ -35789,6 +39854,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.FailureConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                },
+                "Result": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.GitBranchFilterCriteria": {
             "additionalProperties": false,
             "properties": {
@@ -35939,6 +40019,51 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.RuleDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RuleTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleTypeId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.RuleTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.StageDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35948,6 +40073,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "BeforeEntry": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BeforeEntryConditions"
+                },
                 "Blockers": {
                     "items": {
                         "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
@@ -35956,6 +40084,12 @@ var SamSchema = `{
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.FailureConditions"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.SuccessConditions"
                 }
             },
             "required": [
@@ -35980,6 +40114,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.SuccessConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.VariableDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36670,6 +40816,12 @@ var SamSchema = `{
                         "IdentityPoolName": {
                             "type": "string"
                         },
+                        "IdentityPoolTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "OpenIdConnectProviderARNs": {
                             "items": {
                                 "type": "string"
@@ -37062,6 +41214,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::LogDeliveryConfiguration.LogConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -37071,8 +41232,23 @@ var SamSchema = `{
                 "EventSource": {
                     "type": "string"
                 },
+                "FirehoseConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration"
+                },
                 "LogLevel": {
                     "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.S3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::LogDeliveryConfiguration.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -37136,6 +41312,12 @@ var SamSchema = `{
                         "DeviceConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
                         },
+                        "EmailAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "EmailAuthenticationSubject": {
+                            "type": "string"
+                        },
                         "EmailConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
                         },
@@ -37255,6 +41437,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomAuthMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::UserPool.CustomEmailSender": {
             "additionalProperties": false,
             "properties": {
@@ -37393,6 +41584,9 @@ var SamSchema = `{
                 "MinimumLength": {
                     "type": "number"
                 },
+                "PasswordHistorySize": {
+                    "type": "number"
+                },
                 "RequireLowercase": {
                     "type": "boolean"
                 },
@@ -37516,6 +41710,9 @@ var SamSchema = `{
         "AWS::Cognito::UserPool.UserPoolAddOns": {
             "additionalProperties": false,
             "properties": {
+                "AdvancedSecurityAdditionalFlows": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows"
+                },
                 "AdvancedSecurityMode": {
                     "type": "string"
                 }
@@ -40268,6 +44465,97 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::AgentStatus": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayOrder": {
+                            "type": "number"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResetOrderNumber": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "State"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::AgentStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::ApprovedOrigin": {
             "additionalProperties": false,
             "properties": {
@@ -42154,6 +46442,12 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "SubmitAutoEvaluationActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Connect::Rule.SubmitAutoEvaluationAction"
+                    },
+                    "type": "array"
+                },
                 "TaskActions": {
                     "items": {
                         "$ref": "#/definitions/AWS::Connect::Rule.TaskAction"
@@ -42313,6 +46607,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::Rule.SubmitAutoEvaluationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EvaluationFormArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EvaluationFormArn"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::Rule.TaskAction": {
             "additionalProperties": false,
             "properties": {
@@ -43095,6 +47401,185 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Connect::UserHierarchyStructure": {
+            "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": {
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "UserHierarchyStructure": {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.UserHierarchyStructure"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyStructure"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFive": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFour": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelOne": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelThree": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelTwo": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.UserHierarchyStructure": {
+            "additionalProperties": false,
+            "properties": {
+                "LevelFive": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFive"
+                },
+                "LevelFour": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFour"
+                },
+                "LevelOne": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelOne"
+                },
+                "LevelThree": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelThree"
+                },
+                "LevelTwo": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelTwo"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Connect::View": {
             "additionalProperties": false,
             "properties": {
@@ -47270,9 +51755,6 @@ var SamSchema = `{
                         "ComputeConfig": {
                             "$ref": "#/definitions/AWS::DMS::ReplicationConfig.ComputeConfig"
                         },
-                        "ReplicationConfigArn": {
-                            "type": "string"
-                        },
                         "ReplicationConfigIdentifier": {
                             "type": "string"
                         },
@@ -47304,6 +51786,14 @@ var SamSchema = `{
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ComputeConfig",
+                        "ReplicationConfigIdentifier",
+                        "ReplicationType",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -47322,7 +51812,8 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -47421,6 +51912,9 @@ var SamSchema = `{
                         "MultiAZ": {
                             "type": "boolean"
                         },
+                        "NetworkType": {
+                            "type": "string"
+                        },
                         "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
@@ -51688,9 +56182,18 @@ var SamSchema = `{
                         "DomainIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentAccountIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentAccountRegion": {
+                            "type": "string"
+                        },
                         "EnvironmentProfileIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentRoleArn": {
+                            "type": "string"
+                        },
                         "GlossaryTerms": {
                             "items": {
                                 "type": "string"
@@ -51712,7 +56215,6 @@ var SamSchema = `{
                     },
                     "required": [
                         "DomainIdentifier",
-                        "EnvironmentProfileIdentifier",
                         "Name",
                         "ProjectIdentifier"
                     ],
@@ -51751,6 +56253,95 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::DataZone::EnvironmentActions": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::EnvironmentActions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::EnvironmentBlueprintConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -51963,6 +56554,78 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::DataZone::GroupProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "GroupIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::GroupProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::DataZone::Project": {
             "additionalProperties": false,
             "properties": {
@@ -52041,6 +56704,95 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DataZone::ProjectMembership": {
+            "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": {
+                        "Designation": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Member": {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership.Member"
+                        },
+                        "ProjectIdentifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Designation",
+                        "DomainIdentifier",
+                        "Member",
+                        "ProjectIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::ProjectMembership"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::ProjectMembership.Member": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupIdentifier": {
+                    "type": "string"
+                },
+                "UserIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::SubscriptionTarget": {
             "additionalProperties": false,
             "properties": {
@@ -52162,6 +56914,117 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DataZone::UserProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserIdentifier": {
+                            "type": "string"
+                        },
+                        "UserType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "UserIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.IamUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.SsoUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.UserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.IamUserProfileDetails"
+                },
+                "Sso": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.SsoUserProfileDetails"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Deadline::Farm": {
             "additionalProperties": false,
             "properties": {
@@ -52205,6 +57068,12 @@ var SamSchema = `{
                         },
                         "KmsKeyArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -52288,11 +57157,18 @@ var SamSchema = `{
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
                         "Configuration",
                         "DisplayName",
+                        "FarmId",
                         "MaxWorkerCount",
                         "RoleArn"
                     ],
@@ -52655,6 +57531,12 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "VpcId": {
                             "type": "string"
                         }
@@ -52722,27 +57604,94 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Family": {
+                        "LicenseEndpointId": {
                             "type": "string"
                         },
-                        "LicenseEndpointId": {
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Deadline::MeteredProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Deadline::Monitor": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "Port": {
-                            "type": "number"
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
                         },
-                        "ProductId": {
+                        "IdentityCenterInstanceArn": {
                             "type": "string"
                         },
-                        "Vendor": {
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Subdomain": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DisplayName",
+                        "IdentityCenterInstanceArn",
+                        "RoleArn",
+                        "Subdomain"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Deadline::MeteredProduct"
+                        "AWS::Deadline::Monitor"
                     ],
                     "type": "string"
                 },
@@ -52756,7 +57705,8 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -52827,10 +57777,17 @@ var SamSchema = `{
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DisplayName"
+                        "DisplayName",
+                        "FarmId"
                     ],
                     "type": "object"
                 },
@@ -53128,6 +58085,7 @@ var SamSchema = `{
                     },
                     "required": [
                         "DisplayName",
+                        "FarmId",
                         "OsFamily"
                     ],
                     "type": "object"
@@ -54547,6 +59505,9 @@ var SamSchema = `{
                         "TimeToLiveSpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
                         },
+                        "WriteOnDemandThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                        },
                         "WriteProvisionedThroughputSettings": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                         }
@@ -54645,6 +59606,9 @@ var SamSchema = `{
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
                 },
+                "WriteOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                },
                 "WriteProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                 }
@@ -54734,6 +59698,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54755,6 +59728,9 @@ var SamSchema = `{
                 "IndexName": {
                     "type": "string"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 }
@@ -54797,6 +59773,9 @@ var SamSchema = `{
                 "PointInTimeRecoverySpecification": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 },
@@ -54914,6 +59893,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54997,6 +59985,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "OnDemandThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                        },
                         "PointInTimeRecoverySpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
                         },
@@ -55112,6 +60103,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "OnDemandThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                },
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
                 },
@@ -55211,6 +60205,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::Table.OnDemandThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                },
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
             "additionalProperties": false,
             "properties": {
@@ -56168,6 +61174,9 @@ var SamSchema = `{
                         "BgpAsn": {
                             "type": "number"
                         },
+                        "BgpAsnExtended": {
+                            "type": "number"
+                        },
                         "CertificateArn": {
                             "type": "string"
                         },
@@ -57434,6 +62443,9 @@ var SamSchema = `{
                         "Description": {
                             "type": "string"
                         },
+                        "EnablePrivateGua": {
+                            "type": "boolean"
+                        },
                         "OperatingRegions": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
@@ -58514,6 +63526,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EC2::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::Instance.Volume": {
             "additionalProperties": false,
             "properties": {
@@ -63190,12 +68214,6 @@ var SamSchema = `{
                         "Ipv6CidrBlock": {
                             "type": "string"
                         },
-                        "Ipv6CidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Ipv6IpamPoolId": {
                             "type": "string"
                         },
@@ -63609,6 +68627,12 @@ var SamSchema = `{
                         "SourcePortRange": {
                             "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "TrafficDirection": {
                             "type": "string"
                         },
@@ -63893,6 +68917,9 @@ var SamSchema = `{
                         "PropagationDefaultRouteTableId": {
                             "type": "string"
                         },
+                        "SecurityGroupReferencingSupport": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -64570,6 +69597,7 @@ var SamSchema = `{
                         }
                     },
                     "required": [
+                        "DestinationCidrBlock",
                         "TransitGatewayRouteTableId"
                     ],
                     "type": "object"
@@ -64912,6 +69940,9 @@ var SamSchema = `{
                 },
                 "Ipv6Support": {
                     "type": "string"
+                },
+                "SecurityGroupReferencingSupport": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -65673,6 +70704,24 @@ var SamSchema = `{
                         "CustomerGatewayId": {
                             "type": "string"
                         },
+                        "EnableAcceleration": {
+                            "type": "boolean"
+                        },
+                        "LocalIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "LocalIpv6NetworkCidr": {
+                            "type": "string"
+                        },
+                        "OutsideIpAddressType": {
+                            "type": "string"
+                        },
+                        "RemoteIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "RemoteIpv6NetworkCidr": {
+                            "type": "string"
+                        },
                         "StaticRoutesOnly": {
                             "type": "boolean"
                         },
@@ -65685,6 +70734,12 @@ var SamSchema = `{
                         "TransitGatewayId": {
                             "type": "string"
                         },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TunnelInsideIpVersion": {
+                            "type": "string"
+                        },
                         "Type": {
                             "type": "string"
                         },
@@ -67226,6 +72281,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "CustomRoleArn": {
+                            "type": "string"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -67520,6 +72578,9 @@ var SamSchema = `{
             "properties": {
                 "ExecuteCommandConfiguration": {
                     "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                },
+                "ManagedStorageConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ManagedStorageConfiguration"
                 }
             },
             "type": "object"
@@ -67572,113 +72633,125 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::ECS::Cluster.ServiceConnectDefaults": {
+        "AWS::ECS::Cluster.ManagedStorageConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Namespace": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::ECS::ClusterCapacityProviderAssociations": {
-            "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": {
-                        "CapacityProviders": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Cluster": {
-                            "type": "string"
-                        },
-                        "DefaultCapacityProviderStrategy": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "CapacityProviders",
-                        "Cluster",
-                        "DefaultCapacityProviderStrategy"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::ECS::ClusterCapacityProviderAssociations"
-                    ],
+                "FargateEphemeralStorageKmsKeyId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "KmsKeyId": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+        "AWS::ECS::Cluster.ServiceConnectDefaults": {
             "additionalProperties": false,
             "properties": {
-                "Base": {
-                    "type": "number"
-                },
-                "CapacityProvider": {
+                "Namespace": {
                     "type": "string"
-                },
-                "Weight": {
-                    "type": "number"
                 }
             },
-            "required": [
-                "CapacityProvider"
-            ],
             "type": "object"
         },
-        "AWS::ECS::PrimaryTaskSet": {
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "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": {
+                        "CapacityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CapacityProviders",
+                        "Cluster",
+                        "DefaultCapacityProviderStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::ClusterCapacityProviderAssociations"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::PrimaryTaskSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -68588,6 +73661,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "RestartPolicy": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RestartPolicy"
+                },
                 "Secrets": {
                     "items": {
                         "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
@@ -69024,6 +74100,24 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::ECS::TaskDefinition.RestartPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnoredExitCodes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "RestartAttemptPeriod": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::TaskDefinition.RuntimePlatform": {
             "additionalProperties": false,
             "properties": {
@@ -69924,6 +75018,12 @@ var SamSchema = `{
                         "ConfigurationValues": {
                             "type": "string"
                         },
+                        "PodIdentityAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Addon.PodIdentityAssociation"
+                            },
+                            "type": "array"
+                        },
                         "PreserveOnDelete": {
                             "type": "boolean"
                         },
@@ -69967,6 +75067,22 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EKS::Addon.PodIdentityAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceAccount"
+            ],
+            "type": "object"
+        },
         "AWS::EKS::Cluster": {
             "additionalProperties": false,
             "properties": {
@@ -70005,6 +75121,9 @@ var SamSchema = `{
                         "AccessConfig": {
                             "$ref": "#/definitions/AWS::EKS::Cluster.AccessConfig"
                         },
+                        "BootstrapSelfManagedAddons": {
+                            "type": "boolean"
+                        },
                         "EncryptionConfig": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
@@ -70035,8 +75154,14 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "UpgradePolicy": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.UpgradePolicy"
+                        },
                         "Version": {
                             "type": "string"
+                        },
+                        "ZonalShiftConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ZonalShiftConfig"
                         }
                     },
                     "required": [
@@ -70211,6 +75336,24 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EKS::Cluster.UpgradePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "SupportType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ZonalShiftConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EKS::FargateProfile": {
             "additionalProperties": false,
             "properties": {
@@ -71163,6 +76306,9 @@ var SamSchema = `{
                 "Name": {
                     "type": "string"
                 },
+                "ResizeSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetResizingSpecifications"
+                },
                 "TargetOnDemandCapacity": {
                     "type": "number"
                 },
@@ -71184,6 +76330,18 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::EMR::Cluster.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.InstanceGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71248,6 +76406,9 @@ var SamSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71397,11 +76558,29 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71409,6 +76588,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.PlacementGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71560,6 +76754,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.StepConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71654,6 +76860,9 @@ var SamSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "ResizeSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications"
+                        },
                         "TargetOnDemandCapacity": {
                             "type": "number"
                         },
@@ -71754,6 +76963,18 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71778,6 +76999,9 @@ var SamSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71787,11 +77011,29 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71799,6 +77041,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -71821,6 +77078,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -72807,6 +78076,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "InteractiveConfiguration": {
+                            "$ref": "#/definitions/AWS::EMRServerless::Application.InteractiveConfiguration"
+                        },
                         "MaximumCapacity": {
                             "$ref": "#/definitions/AWS::EMRServerless::Application.MaximumAllowedResources"
                         },
@@ -72987,6 +78259,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EMRServerless::Application.InteractiveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LivyEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "StudioEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMRServerless::Application.LogTypeMapKeyValuePair": {
             "additionalProperties": false,
             "properties": {
@@ -73091,6 +78375,9 @@ var SamSchema = `{
                 "Disk": {
                     "type": "string"
                 },
+                "DiskType": {
+                    "type": "string"
+                },
                 "Memory": {
                     "type": "string"
                 }
@@ -75272,6 +80559,12 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "ListenerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute"
+                            },
+                            "type": "array"
+                        },
                         "LoadBalancerArn": {
                             "type": "string"
                         },
@@ -75486,6 +80779,18 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ElasticLoadBalancingV2::Listener.MutualAuthentication": {
             "additionalProperties": false,
             "properties": {
@@ -76949,6 +82254,31 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "RecordMatchingModel": {
+                    "type": "string"
+                },
+                "RuleDefinitionType": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "RecordMatchingModel"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdMappingWorkflow.IdMappingTechniques": {
             "additionalProperties": false,
             "properties": {
@@ -76957,6 +82287,9 @@ var SamSchema = `{
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.ProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties"
                 }
             },
             "type": "object"
@@ -77030,6 +82363,25 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdNamespace": {
             "additionalProperties": false,
             "properties": {
@@ -77131,6 +82483,9 @@ var SamSchema = `{
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties"
                 }
             },
             "required": [
@@ -77174,213 +82529,34 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow": {
+        "AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "AttributeMatchingModel": {
                     "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
-                            },
-                            "type": "array"
-                        },
-                        "OutputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
-                            },
-                            "type": "array"
-                        },
-                        "ResolutionTechniques": {
-                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "WorkflowName": {
-                            "type": "string"
-                        }
+                "RecordMatchingModels": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "InputSourceConfig",
-                        "OutputSourceConfig",
-                        "ResolutionTechniques",
-                        "RoleArn",
-                        "WorkflowName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::EntityResolution::MatchingWorkflow"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "InputSourceARN": {
-                    "type": "string"
-                },
-                "SchemaArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputSourceARN",
-                "SchemaArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "IntermediateS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
-            "additionalProperties": false,
-            "properties": {
-                "Hashed": {
-                    "type": "boolean"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "KMSArn": {
-                    "type": "string"
+                    "type": "array"
                 },
-                "Output": {
+                "RuleDefinitionTypes": {
                     "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "OutputS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Output",
-                "OutputS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateSourceConfiguration": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
-                },
-                "ProviderConfiguration": {
-                    "additionalProperties": true,
-                    "patternProperties": {
-                        "^[a-zA-Z0-9]+$": {
-                            "type": "string"
-                        }
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.Rule"
                     },
-                    "type": "object"
-                },
-                "ProviderServiceArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ProviderServiceArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
-            "additionalProperties": false,
-            "properties": {
-                "ProviderProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
-                },
-                "ResolutionType": {
-                    "type": "string"
-                },
-                "RuleBasedProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                    "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+        "AWS::EntityResolution::IdNamespace.Rule": {
             "additionalProperties": false,
             "properties": {
                 "MatchingKeys": {
@@ -77399,26 +82575,269 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "AttributeMatchingModel": {
-                    "type": "string"
-                },
-                "Rules": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AttributeMatchingModel",
-                "Rules"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::PolicyStatement": {
+        "AWS::EntityResolution::MatchingWorkflow": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IncrementalRunConfig": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig"
+                        },
+                        "InputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
+                            },
+                            "type": "array"
+                        },
+                        "OutputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
+                            },
+                            "type": "array"
+                        },
+                        "ResolutionTechniques": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputSourceConfig",
+                        "OutputSourceConfig",
+                        "ResolutionTechniques",
+                        "RoleArn",
+                        "WorkflowName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EntityResolution::MatchingWorkflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IncrementalRunType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IncrementalRunType"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "InputSourceARN": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSourceARN",
+                "SchemaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Hashed": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "KMSArn": {
+                    "type": "string"
+                },
+                "Output": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                    },
+                    "type": "array"
+                },
+                "OutputS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Output",
+                "OutputS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateSourceConfiguration": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
+                },
+                "ProviderConfiguration": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ProviderServiceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderServiceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
+                },
+                "ResolutionType": {
+                    "type": "string"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "MatchPurpose": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::PolicyStatement": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -77595,6 +83014,9 @@ var SamSchema = `{
                 "GroupName": {
                     "type": "string"
                 },
+                "Hashed": {
+                    "type": "boolean"
+                },
                 "MatchKey": {
                     "type": "string"
                 },
@@ -78519,9 +83941,18 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Events::EventBus.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
                         "EventSourceName": {
                             "type": "string"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -78561,6 +83992,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Events::EventBus.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Events::EventBusPolicy": {
             "additionalProperties": false,
             "properties": {
@@ -80536,80 +85976,95 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::FMS::Policy.NetworkFirewallPolicy": {
+        "AWS::FMS::Policy.IcmpTypeCode": {
             "additionalProperties": false,
             "properties": {
-                "FirewallDeploymentModel": {
-                    "type": "string"
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
                 }
             },
             "required": [
-                "FirewallDeploymentModel"
+                "Code",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyOption": {
+        "AWS::FMS::Policy.NetworkAclCommonPolicy": {
             "additionalProperties": false,
             "properties": {
-                "NetworkFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
-                },
-                "ThirdPartyFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                "NetworkAclEntrySet": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntrySet"
                 }
             },
+            "required": [
+                "NetworkAclEntrySet"
+            ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyTag": {
+        "AWS::FMS::Policy.NetworkAclEntry": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CidrBlock": {
                     "type": "string"
                 },
-                "Value": {
+                "Egress": {
+                    "type": "boolean"
+                },
+                "IcmpTypeCode": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.IcmpTypeCode"
+                },
+                "Ipv6CidrBlock": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::FMS::Policy.ResourceTag": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PortRange"
+                },
+                "Protocol": {
                     "type": "string"
                 },
-                "Value": {
+                "RuleAction": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key"
+                "Egress",
+                "Protocol",
+                "RuleAction"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.SecurityServicePolicyData": {
+        "AWS::FMS::Policy.NetworkAclEntrySet": {
             "additionalProperties": false,
             "properties": {
-                "ManagedServiceData": {
-                    "type": "string"
+                "FirstEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 },
-                "PolicyOption": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                "ForceRemediateForFirstEntries": {
+                    "type": "boolean"
                 },
-                "Type": {
-                    "type": "string"
+                "ForceRemediateForLastEntries": {
+                    "type": "boolean"
+                },
+                "LastEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Type"
+                "ForceRemediateForFirstEntries",
+                "ForceRemediateForLastEntries"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
+        "AWS::FMS::Policy.NetworkFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
                 "FirewallDeploymentModel": {
@@ -80621,224 +86076,316 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::FMS::ResourceSet": {
+        "AWS::FMS::Policy.PolicyOption": {
             "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"
-                        }
-                    ]
+                "NetworkAclCommonPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclCommonPolicy"
                 },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ResourceTypeList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Resources": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "ResourceTypeList"
-                    ],
-                    "type": "object"
+                "NetworkFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::FMS::ResourceSet"
-                    ],
+                "ThirdPartyFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation": {
+        "AWS::FMS::Policy.PortRange": {
             "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": {
-                        "BatchImportMetaDataOnCreate": {
-                            "type": "boolean"
-                        },
-                        "DataRepositoryPath": {
-                            "type": "string"
-                        },
-                        "FileSystemId": {
-                            "type": "string"
-                        },
-                        "FileSystemPath": {
-                            "type": "string"
-                        },
-                        "ImportedFileChunkSize": {
-                            "type": "number"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DataRepositoryPath",
-                        "FileSystemId",
-                        "FileSystemPath"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::FSx::DataRepositoryAssociation"
-                    ],
-                    "type": "string"
+                "From": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "To": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "From",
+                "To"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+        "AWS::FMS::Policy.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+        "AWS::FMS::Policy.SecurityServicePolicyData": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ManagedServiceData": {
+                    "type": "string"
+                },
+                "PolicyOption": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.S3": {
+        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
-                "AutoExportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
-                },
-                "AutoImportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                "FirewallDeploymentModel": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "FirewallDeploymentModel"
+            ],
             "type": "object"
         },
-        "AWS::FSx::FileSystem": {
+        "AWS::FMS::ResourceSet": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ResourceTypeList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation": {
+            "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": {
+                        "BatchImportMetaDataOnCreate": {
+                            "type": "boolean"
+                        },
+                        "DataRepositoryPath": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "FileSystemPath": {
+                            "type": "string"
+                        },
+                        "ImportedFileChunkSize": {
+                            "type": "number"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataRepositoryPath",
+                        "FileSystemId",
+                        "FileSystemPath"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::DataRepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoExportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
+                },
+                "AutoImportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -81028,6 +86575,9 @@ var SamSchema = `{
                 "ImportedFileChunkSize": {
                     "type": "number"
                 },
+                "MetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.MetadataConfiguration"
+                },
                 "PerUnitStorageThroughput": {
                     "type": "number"
                 },
@@ -81037,6 +86587,18 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::FSx::FileSystem.MetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::FSx::FileSystem.NfsExports": {
             "additionalProperties": false,
             "properties": {
@@ -84815,6 +90377,9 @@ var SamSchema = `{
         "AWS::GlobalAccelerator::CrossAccountAttachment.Resource": {
             "additionalProperties": false,
             "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
                 "EndpointId": {
                     "type": "string"
                 },
@@ -84822,9 +90387,6 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
-            "required": [
-                "EndpointId"
-            ],
             "type": "object"
         },
         "AWS::GlobalAccelerator::EndpointGroup": {
@@ -85532,6 +91094,12 @@ var SamSchema = `{
                 "ConnectionName": {
                     "type": "string"
                 },
+                "EnableAdditionalMetadata": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "Exclusions": {
                     "items": {
                         "type": "string"
@@ -85982,6 +91550,9 @@ var SamSchema = `{
                         },
                         "DatabaseInput": {
                             "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -86264,9 +91835,18 @@ var SamSchema = `{
                         "GlueVersion": {
                             "type": "string"
                         },
+                        "JobMode": {
+                            "type": "string"
+                        },
+                        "JobRunQueuingEnabled": {
+                            "type": "boolean"
+                        },
                         "LogUri": {
                             "type": "string"
                         },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
                         "MaxCapacity": {
                             "type": "number"
                         },
@@ -87892,7 +93472,7 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::Glue::Workflow": {
+        "AWS::Glue::UsageProfile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -87927,27 +93507,30 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultRunProperties": {
-                            "type": "object"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ProfileConfiguration"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "MaxConcurrentRuns": {
-                            "type": "number"
-                        },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "type": "object"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Glue::Workflow"
+                        "AWS::Glue::UsageProfile"
                     ],
                     "type": "string"
                 },
@@ -87961,11 +93544,130 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Grafana::Workspace": {
+        "AWS::Glue::UsageProfile.ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::UsageProfile.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JobConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SessionConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "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": {
+                        "DefaultRunProperties": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentRuns": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Grafana::Workspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91736,7 +97438,9 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "FindingCriteria"
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name"
                     ],
                     "type": "object"
                 },
@@ -91946,7 +97650,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Master": {
+        "AWS::GuardDuty::MalwareProtectionPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91981,25 +97685,31 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DetectorId": {
-                            "type": "string"
+                        "Actions": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNActions"
                         },
-                        "InvitationId": {
-                            "type": "string"
+                        "ProtectedResource": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource"
                         },
-                        "MasterId": {
+                        "Role": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.TagItem"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DetectorId",
-                        "MasterId"
+                        "ProtectedResource",
+                        "Role"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Master"
+                        "AWS::GuardDuty::MalwareProtectionPlan"
                     ],
                     "type": "string"
                 },
@@ -92018,7 +97728,80 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Member": {
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNActions": {
+            "additionalProperties": false,
+            "properties": {
+                "Tagging": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNTagging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.S3Bucket"
+                }
+            },
+            "required": [
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNTagging": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.S3Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "ObjectPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92056,30 +97839,22 @@ var SamSchema = `{
                         "DetectorId": {
                             "type": "string"
                         },
-                        "DisableEmailNotification": {
-                            "type": "boolean"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "MemberId": {
-                            "type": "string"
-                        },
-                        "Message": {
+                        "InvitationId": {
                             "type": "string"
                         },
-                        "Status": {
+                        "MasterId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Email"
+                        "DetectorId",
+                        "MasterId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Member"
+                        "AWS::GuardDuty::Master"
                     ],
                     "type": "string"
                 },
@@ -92098,7 +97873,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet": {
+        "AWS::GuardDuty::Member": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92133,37 +97908,33 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Activate": {
-                            "type": "boolean"
-                        },
                         "DetectorId": {
                             "type": "string"
                         },
-                        "Format": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
                             "type": "string"
                         },
-                        "Location": {
+                        "MemberId": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Message": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
-                            },
-                            "type": "array"
+                        "Status": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "Location"
+                        "Email"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::ThreatIntelSet"
+                        "AWS::GuardDuty::Member"
                     ],
                     "type": "string"
                 },
@@ -92182,23 +97953,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::HealthImaging::Datastore": {
+        "AWS::GuardDuty::ThreatIntelSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92233,27 +97988,37 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DatastoreName": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
                             },
-                            "type": "object"
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Format",
+                        "Location"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::HealthImaging::Datastore"
+                        "AWS::GuardDuty::ThreatIntelSet"
                     ],
                     "type": "string"
                 },
@@ -92267,11 +98032,101 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::HealthLake::FHIRDatastore": {
+        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthImaging::Datastore": {
+            "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": {
+                        "DatastoreName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthImaging::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92888,9 +98743,6 @@ var SamSchema = `{
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "ThumbprintList"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -92909,8 +98761,7 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -94086,7 +99937,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration": {
+        "AWS::IVS::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94121,36 +99972,24 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DestinationConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
-                        },
                         "Name": {
                             "type": "string"
                         },
-                        "RecordingReconnectWindowSeconds": {
-                            "type": "number"
-                        },
-                        "RenditionConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        "PublicKeyMaterial": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ThumbnailConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
-                    "required": [
-                        "DestinationConfiguration"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::RecordingConfiguration"
+                        "AWS::IVS::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -94164,69 +100003,11 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RenditionSelection": {
-                    "type": "string"
-                },
-                "Renditions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "BucketName": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "BucketName"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RecordingMode": {
-                    "type": "string"
-                },
-                "Resolution": {
-                    "type": "string"
-                },
-                "Storage": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TargetIntervalSeconds": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::Stage": {
+        "AWS::IVS::RecordingConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94261,21 +100042,36 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "RecordingReconnectWindowSeconds": {
+                            "type": "number"
+                        },
+                        "RenditionConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "ThumbnailConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::Stage"
+                        "AWS::IVS::RecordingConfiguration"
                     ],
                     "type": "string"
                 },
@@ -94289,85 +100085,36 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RenditionSelection": {
                     "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": {
-                        "Name": {
-                            "type": "string"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "Renditions": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "S3"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::IVS::StorageConfiguration"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "BucketName": {
@@ -94379,7 +100126,202 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::IVS::StreamKey": {
+        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordingMode": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                },
+                "Storage": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetIntervalSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::Stage": {
+            "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": {
+                        "AutoParticipantRecordingConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::Stage.AutoParticipantRecordingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Stage.AutoParticipantRecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MediaTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StorageConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StorageConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -96814,6 +102756,12 @@ var SamSchema = `{
                             "$ref": "#/definitions/AWS::InspectorV2::CisScanConfiguration.CisTargets"
                         }
                     },
+                    "required": [
+                        "ScanName",
+                        "Schedule",
+                        "SecurityLevel",
+                        "Targets"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -96832,7 +102780,8 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -98495,9 +104444,18 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ApplicationProtocol": {
+                            "type": "string"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
                         "AuthorizerConfig": {
                             "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
                         },
+                        "ClientCertificateConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.ClientCertificateConfig"
+                        },
                         "DomainConfigurationName": {
                             "type": "string"
                         },
@@ -98566,6 +104524,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::IoT::DomainConfiguration.ClientCertificateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientCertificateCallbackArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::IoT::DomainConfiguration.ServerCertificateConfig": {
             "additionalProperties": false,
             "properties": {
@@ -104021,6 +109988,12 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "SignalsToFetch": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchInformation"
+                            },
+                            "type": "array"
+                        },
                         "SpoolingMode": {
                             "type": "string"
                         },
@@ -104038,7 +110011,6 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "Action",
                         "CollectionScheme",
                         "Name",
                         "SignalCatalogArn",
@@ -104100,9 +110072,28 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                },
+                "TriggerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression",
+                "TriggerMode"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.DataDestinationConfig": {
             "additionalProperties": false,
             "properties": {
+                "MqttTopicConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.MqttTopicConfig"
+                },
                 "S3Config": {
                     "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.S3Config"
                 },
@@ -104112,6 +110103,22 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.MqttTopicConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "MqttTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "MqttTopicArn"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.S3Config": {
             "additionalProperties": false,
             "properties": {
@@ -104133,6 +110140,44 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.SignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig"
+                },
+                "TimeBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTFleetWise::Campaign.SignalFetchInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConditionLanguageVersion": {
+                    "type": "number"
+                },
+                "FullyQualifiedName": {
+                    "type": "string"
+                },
+                "SignalFetchConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchConfig"
+                }
+            },
+            "required": [
+                "Actions",
+                "FullyQualifiedName",
+                "SignalFetchConfig"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.SignalInformation": {
             "additionalProperties": false,
             "properties": {
@@ -104163,6 +110208,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionFrequencyMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutionFrequencyMs"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.TimestreamConfig": {
             "additionalProperties": false,
             "properties": {
@@ -111040,6 +117097,75 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::Kinesis::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "ResourcePolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kinesis::Stream": {
             "additionalProperties": false,
             "properties": {
@@ -111954,6 +118080,9 @@ var SamSchema = `{
                 "ApplicationSnapshotConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
                 },
+                "ApplicationSystemRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration"
+                },
                 "EnvironmentProperties": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
                 },
@@ -112014,6 +118143,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RollbackEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "RollbackEnabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
             "additionalProperties": false,
             "properties": {
@@ -112976,6 +119117,9 @@ var SamSchema = `{
                         "HttpEndpointDestinationConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
                         },
+                        "IcebergDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration"
+                        },
                         "KinesisStreamSourceConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
                         },
@@ -113187,6 +119331,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113265,6 +119418,31 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDatabaseName": {
+                    "type": "string"
+                },
+                "DestinationTableName": {
+                    "type": "string"
+                },
+                "S3ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "UniqueKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DestinationDatabaseName",
+                "DestinationTableName"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.DocumentIdOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113505,6 +119683,9 @@ var SamSchema = `{
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
@@ -113528,6 +119709,47 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "DestinationTableConfigurationList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration"
+                    },
+                    "type": "array"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "s3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CatalogConfiguration",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -113574,6 +119796,9 @@ var SamSchema = `{
                 "MSKClusterARN": {
                     "type": "string"
                 },
+                "ReadFromTimestamp": {
+                    "type": "string"
+                },
                 "TopicName": {
                     "type": "string"
                 }
@@ -113760,6 +119985,9 @@ var SamSchema = `{
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "Username": {
                     "type": "string"
                 }
@@ -113767,10 +119995,8 @@ var SamSchema = `{
             "required": [
                 "ClusterJDBCURL",
                 "CopyCommand",
-                "Password",
                 "RoleARN",
-                "S3Configuration",
-                "Username"
+                "S3Configuration"
             ],
             "type": "object"
         },
@@ -113850,6 +120076,24 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecretARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.Serializer": {
             "additionalProperties": false,
             "properties": {
@@ -113862,12 +120106,27 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.SnowflakeDestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "AccountUrl": {
                     "type": "string"
                 },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints"
+                },
                 "CloudWatchLoggingOptions": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
                 },
@@ -113907,6 +120166,9 @@ var SamSchema = `{
                 "Schema": {
                     "type": "string"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "SnowflakeRoleConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeRoleConfiguration"
                 },
@@ -113923,12 +120185,10 @@ var SamSchema = `{
             "required": [
                 "AccountUrl",
                 "Database",
-                "PrivateKey",
                 "RoleARN",
                 "S3Configuration",
                 "Schema",
-                "Table",
-                "User"
+                "Table"
             ],
             "type": "object"
         },
@@ -114009,12 +120269,14 @@ var SamSchema = `{
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
                 "HECEndpoint",
                 "HECEndpointType",
-                "HECToken",
                 "S3Configuration"
             ],
             "type": "object"
@@ -115383,9 +121645,6 @@ var SamSchema = `{
                     "type": "array"
                 }
             },
-            "required": [
-                "AdditionalVersionWeights"
-            ],
             "type": "object"
         },
         "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
@@ -115459,6 +121718,12 @@ var SamSchema = `{
                         },
                         "Description": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -115696,6 +121961,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
                         "MaximumBatchingWindowInSeconds": {
                             "type": "number"
                         },
@@ -115735,6 +122003,12 @@ var SamSchema = `{
                         "StartingPositionTimestamp": {
                             "type": "number"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "Topics": {
                             "items": {
                                 "type": "string"
@@ -115977,6 +122251,9 @@ var SamSchema = `{
                         "PackageType": {
                             "type": "string"
                         },
+                        "RecursiveLoop": {
+                            "type": "string"
+                        },
                         "ReservedConcurrentExecutions": {
                             "type": "number"
                         },
@@ -116050,6 +122327,9 @@ var SamSchema = `{
                 "S3ObjectVersion": {
                     "type": "string"
                 },
+                "SourceKMSKeyArn": {
+                    "type": "string"
+                },
                 "ZipFile": {
                     "type": "string"
                 }
@@ -116643,6 +122923,9 @@ var SamSchema = `{
                         "FunctionName": {
                             "type": "string"
                         },
+                        "Policy": {
+                            "type": "object"
+                        },
                         "ProvisionedConcurrencyConfig": {
                             "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
                         },
@@ -116703,6 +122986,110 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::LaunchWizard::Deployment": {
+            "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": {
+                        "DeploymentPatternName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Specifications": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LaunchWizard::Deployment.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "WorkloadName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeploymentPatternName",
+                        "Name",
+                        "Specifications",
+                        "WorkloadName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LaunchWizard::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LaunchWizard::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
         "AWS::Lex::Bot": {
             "additionalProperties": false,
             "properties": {
@@ -124208,6 +130595,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::MSK::Replicator.ReplicationTopicNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MSK::Replicator.TopicReplication": {
             "additionalProperties": false,
             "properties": {
@@ -124223,6 +130619,9 @@ var SamSchema = `{
                 "StartingPosition": {
                     "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationStartingPosition"
                 },
+                "TopicNameConfiguration": {
+                    "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationTopicNameConfiguration"
+                },
                 "TopicsToExclude": {
                     "items": {
                         "type": "string"
@@ -124538,9 +130937,15 @@ var SamSchema = `{
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
                         },
+                        "MaxWebservers": {
+                            "type": "number"
+                        },
                         "MaxWorkers": {
                             "type": "number"
                         },
+                        "MinWebservers": {
+                            "type": "number"
+                        },
                         "MinWorkers": {
                             "type": "number"
                         },
@@ -125927,6 +132332,15 @@ var SamSchema = `{
                         "AvailabilityZone": {
                             "type": "string"
                         },
+                        "Maintenance": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Maintenance"
+                        },
+                        "MediaStreams": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStream"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -125935,6 +132349,15 @@ var SamSchema = `{
                         },
                         "SourceFailoverConfig": {
                             "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        },
+                        "SourceMonitoringConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.SourceMonitoringConfig"
+                        },
+                        "VpcInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.VpcInterface"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -126018,6 +132441,33 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.Fmtp": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelOrder": {
+                    "type": "string"
+                },
+                "Colorimetry": {
+                    "type": "string"
+                },
+                "ExactFramerate": {
+                    "type": "string"
+                },
+                "Par": {
+                    "type": "string"
+                },
+                "Range": {
+                    "type": "string"
+                },
+                "ScanMode": {
+                    "type": "string"
+                },
+                "Tcs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.GatewayBridgeSource": {
             "additionalProperties": false,
             "properties": {
@@ -126033,6 +132483,119 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.InputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Interface"
+                }
+            },
+            "required": [
+                "InputPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Maintenance": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceDay": {
+                    "type": "string"
+                },
+                "MaintenanceStartHour": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaintenanceDay",
+                "MaintenanceStartHour"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamAttributes"
+                },
+                "ClockRate": {
+                    "type": "number"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Fmt": {
+                    "type": "number"
+                },
+                "MediaStreamId": {
+                    "type": "number"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                },
+                "MediaStreamType": {
+                    "type": "string"
+                },
+                "VideoFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MediaStreamId",
+                "MediaStreamName",
+                "MediaStreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Fmtp": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Fmtp"
+                },
+                "Lang": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingName": {
+                    "type": "string"
+                },
+                "InputConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.InputConfiguration"
+                    },
+                    "type": "array"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.Source": {
             "additionalProperties": false,
             "properties": {
@@ -126060,6 +132623,15 @@ var SamSchema = `{
                 "MaxLatency": {
                     "type": "number"
                 },
+                "MaxSyncBuffer": {
+                    "type": "number"
+                },
+                "MediaStreamSourceConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamSourceConfiguration"
+                    },
+                    "type": "array"
+                },
                 "MinLatency": {
                     "type": "number"
                 },
@@ -126099,154 +132671,202 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.SourcePriority": {
+        "AWS::MediaConnect::Flow.SourceMonitoringConfig": {
             "additionalProperties": false,
             "properties": {
-                "PrimarySource": {
+                "ThumbnailState": {
                     "type": "string"
                 }
             },
             "required": [
-                "PrimarySource"
+                "ThumbnailState"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
+        "AWS::MediaConnect::Flow.SourcePriority": {
             "additionalProperties": false,
             "properties": {
-                "VpcInterfaceName": {
+                "PrimarySource": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PrimarySource"
+            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement": {
+        "AWS::MediaConnect::Flow.VpcInterface": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Name": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "NetworkInterfaceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "NetworkInterfaceType": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "RoleArn": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DataTransferSubscriberFeePercent": {
-                            "type": "number"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Encryption": {
-                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
-                        },
-                        "EntitlementStatus": {
-                            "type": "string"
-                        },
-                        "FlowArn": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Description",
-                        "FlowArn",
-                        "Name",
-                        "Subscribers"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::MediaConnect::FlowEntitlement"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "SubnetId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "RoleArn",
+                "SecurityGroupIds",
+                "SubnetId"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
-                "Algorithm": {
-                    "type": "string"
-                },
-                "ConstantInitializationVector": {
-                    "type": "string"
-                },
-                "DeviceId": {
-                    "type": "string"
-                },
-                "KeyType": {
-                    "type": "string"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "ResourceId": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                },
-                "SecretArn": {
-                    "type": "string"
-                },
-                "Url": {
+                "VpcInterfaceName": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Algorithm",
-                "RoleArn"
-            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowOutput": {
+        "AWS::MediaConnect::FlowEntitlement": {
+            "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": {
+                        "DataTransferSubscriberFeePercent": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
+                        },
+                        "EntitlementStatus": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "FlowArn",
+                        "Name",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowEntitlement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "DeviceId": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Algorithm",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -126302,12 +132922,21 @@ var SamSchema = `{
                         "MaxLatency": {
                             "type": "number"
                         },
+                        "MediaStreamOutputConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "MinLatency": {
                             "type": "number"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "OutputStatus": {
+                            "type": "string"
+                        },
                         "Port": {
                             "type": "number"
                         },
@@ -126354,6 +132983,41 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationIp": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Interface"
+                }
+            },
+            "required": [
+                "DestinationIp",
+                "DestinationPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.EncodingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFactor": {
+                    "type": "number"
+                },
+                "EncoderProfile": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionFactor"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -126376,6 +133040,43 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.DestinationConfiguration"
+                    },
+                    "type": "array"
+                },
+                "EncodingName": {
+                    "type": "string"
+                },
+                "EncodingParameters": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.EncodingParameters"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
@@ -127533,6 +134234,9 @@ var SamSchema = `{
             "properties": {
                 "AvailSettings": {
                     "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                },
+                "Scte35SegmentationScope": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -128459,6 +135163,9 @@ var SamSchema = `{
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "NumRefFrames": {
                     "type": "number"
                 },
@@ -128606,6 +135313,9 @@ var SamSchema = `{
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "MvOverPictureBoundaries": {
                     "type": "string"
                 },
@@ -130315,7 +137025,7 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaLive::Input": {
+        "AWS::MediaLive::ChannelPlacementGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130350,57 +137060,30 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
-                            },
-                            "type": "array"
+                        "ClusterId": {
+                            "type": "string"
                         },
-                        "InputDevices": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
-                            },
-                            "type": "array"
+                        "Name": {
+                            "type": "string"
                         },
-                        "InputSecurityGroups": {
+                        "Nodes": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "MediaConnectFlows": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Sources": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                                "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup.Tags"
                             },
                             "type": "array"
-                        },
-                        "Tags": {
-                            "type": "object"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "Vpc": {
-                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
                         }
                     },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Input"
+                        "AWS::MediaLive::ChannelPlacementGroup"
                     ],
                     "type": "string"
                 },
@@ -130418,76 +137101,727 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Input.InputDestinationRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "StreamName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputSourceRequest": {
+        "AWS::MediaLive::ChannelPlacementGroup.Tags": {
             "additionalProperties": false,
             "properties": {
-                "PasswordParam": {
-                    "type": "string"
-                },
-                "Url": {
+                "Key": {
                     "type": "string"
                 },
-                "Username": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputVpcRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "SecurityGroupIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "SubnetIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "FlowArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::InputSecurityGroup": {
+        "AWS::MediaLive::CloudWatchAlarmTemplate": {
+            "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": {
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetResourceType": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods",
+                        "GroupIdentifier",
+                        "MetricName",
+                        "Name",
+                        "Period",
+                        "Statistic",
+                        "TargetResourceType",
+                        "Threshold",
+                        "TreatMissingData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::CloudWatchAlarmTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster": {
+            "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": {
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster.ClusterNetworkSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Cluster.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.ClusterNetworkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRoute": {
+                    "type": "string"
+                },
+                "InterfaceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Cluster.InterfaceMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.InterfaceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalInterfaceName": {
+                    "type": "string"
+                },
+                "NetworkId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventTargets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget"
+                            },
+                            "type": "array"
+                        },
+                        "EventType": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "EventType",
+                        "GroupIdentifier",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "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": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "InputDevices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
+                            },
+                            "type": "array"
+                        },
+                        "InputSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MediaConnectFlows": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                            },
+                            "type": "array"
+                        },
+                        "SrtSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.SrtSettingsRequest"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDestinationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputVpcRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerDecryptionRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "PassphraseSecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerDecryptionRequest"
+                },
+                "MinimumLatency": {
+                    "type": "number"
+                },
+                "SrtListenerAddress": {
+                    "type": "string"
+                },
+                "SrtListenerPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtSettingsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SrtCallerSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerSourceRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130598,41 +137932,500 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
-                            },
-                            "type": "array"
-                        },
-                        "MultiplexSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "MultiplexSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZones",
+                        "MultiplexSettings",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntitlementArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexMediaConnectOutputDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumVideoBufferDelayMilliseconds": {
+                    "type": "number"
+                },
+                "TransportStreamBitrate": {
+                    "type": "number"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "TransportStreamReservedBitrate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TransportStreamBitrate",
+                "TransportStreamId"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram": {
+            "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": {
+                        "MultiplexId": {
+                            "type": "string"
+                        },
+                        "MultiplexProgramSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
+                        },
+                        "PacketIdentifiersMap": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        },
+                        "PipelineDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredChannelPipeline": {
+                            "type": "string"
+                        },
+                        "ProgramName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplexprogram"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbSubPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbTeletextPid": {
+                    "type": "number"
+                },
+                "EtvPlatformPid": {
+                    "type": "number"
+                },
+                "EtvSignalPid": {
+                    "type": "number"
+                },
+                "KlvDataPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "PcrPid": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "number"
+                },
+                "PrivateMetadataPid": {
+                    "type": "number"
+                },
+                "Scte27Pids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Scte35Pid": {
+                    "type": "number"
+                },
+                "TimedMetadataPid": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveChannelPipeline": {
+                    "type": "string"
+                },
+                "PipelineId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PreferredChannelPipeline": {
+                    "type": "string"
+                },
+                "ProgramNumber": {
+                    "type": "number"
+                },
+                "ServiceDescriptor": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
+                },
+                "VideoSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                }
+            },
+            "required": [
+                "ProgramNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumBitrate": {
+                    "type": "number"
+                },
+                "MinimumBitrate": {
+                    "type": "number"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantBitrate": {
+                    "type": "number"
+                },
+                "StatmuxSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network": {
+            "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": {
+                        "IpPools": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.IpPool"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Routes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Route"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpPools",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Network"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.IpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Route": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Gateway": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::SdiSource": {
+            "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": {
+                        "Mode": {
+                            "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                                "$ref": "#/definitions/AWS::MediaLive::SdiSource.Tags"
                             },
                             "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AvailabilityZones",
-                        "MultiplexSettings",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplex"
+                        "AWS::MediaLive::SdiSource"
                     ],
                     "type": "string"
                 },
@@ -130651,47 +138444,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "EntitlementArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
-            "additionalProperties": false,
-            "properties": {
-                "MultiplexMediaConnectOutputDestinationSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumVideoBufferDelayMilliseconds": {
-                    "type": "number"
-                },
-                "TransportStreamBitrate": {
-                    "type": "number"
-                },
-                "TransportStreamId": {
-                    "type": "number"
-                },
-                "TransportStreamReservedBitrate": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "TransportStreamBitrate",
-                "TransportStreamId"
-            ],
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.Tags": {
+        "AWS::MediaLive::SdiSource.Tags": {
             "additionalProperties": false,
             "properties": {
                 "Key": {
@@ -130703,7 +138456,7 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram": {
+        "AWS::MediaLive::SignalMap": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130738,36 +138491,49 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ChannelId": {
-                            "type": "string"
+                        "CloudWatchAlarmTemplateGroupIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "MultiplexId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MultiplexProgramSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
-                        },
-                        "PacketIdentifiersMap": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        "DiscoveryEntryPointArn": {
+                            "type": "string"
                         },
-                        "PipelineDetails": {
+                        "EventBridgeRuleTemplateGroupIdentifiers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "PreferredChannelPipeline": {
-                            "type": "string"
+                        "ForceRediscovery": {
+                            "type": "boolean"
                         },
-                        "ProgramName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
+                    "required": [
+                        "DiscoveryEntryPointArn",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplexprogram"
+                        "AWS::MediaLive::SignalMap"
                     ],
                     "type": "string"
                 },
@@ -130781,143 +138547,81 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+        "AWS::MediaLive::SignalMap.MediaResource": {
             "additionalProperties": false,
             "properties": {
-                "AudioPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbSubPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbTeletextPid": {
-                    "type": "number"
-                },
-                "EtvPlatformPid": {
-                    "type": "number"
-                },
-                "EtvSignalPid": {
-                    "type": "number"
-                },
-                "KlvDataPids": {
+                "Destinations": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
                 },
-                "PcrPid": {
-                    "type": "number"
-                },
-                "PmtPid": {
-                    "type": "number"
-                },
-                "PrivateMetadataPid": {
-                    "type": "number"
+                "Name": {
+                    "type": "string"
                 },
-                "Scte27Pids": {
+                "Sources": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
-                },
-                "Scte35Pid": {
-                    "type": "number"
-                },
-                "TimedMetadataPid": {
-                    "type": "number"
-                },
-                "VideoPid": {
-                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+        "AWS::MediaLive::SignalMap.MediaResourceNeighbor": {
             "additionalProperties": false,
             "properties": {
-                "ActiveChannelPipeline": {
+                "Arn": {
                     "type": "string"
                 },
-                "PipelineId": {
+                "Name": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Arn"
+            ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+        "AWS::MediaLive::SignalMap.MonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "ProviderName": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ServiceName": {
+                "ErrorMessage": {
+                    "type": "string"
+                },
+                "Status": {
                     "type": "string"
                 }
             },
             "required": [
-                "ProviderName",
-                "ServiceName"
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+        "AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "PreferredChannelPipeline": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ProgramNumber": {
-                    "type": "number"
-                },
-                "ServiceDescriptor": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
-                },
-                "VideoSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                "Status": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ProgramNumber"
+                "DetailsUri",
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumBitrate": {
-                    "type": "number"
-                },
-                "MinimumBitrate": {
-                    "type": "number"
-                },
-                "Priority": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "ConstantBitrate": {
-                    "type": "number"
-                },
-                "StatmuxSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
-                }
-            },
-            "type": "object"
-        },
         "AWS::MediaPackage::Asset": {
             "additionalProperties": false,
             "properties": {
@@ -132107,6 +139811,9 @@ var SamSchema = `{
                         "Description": {
                             "type": "string"
                         },
+                        "InputType": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -132344,9 +140051,18 @@ var SamSchema = `{
                         "ContainerType": {
                             "type": "string"
                         },
+                        "DashManifests": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Description": {
                             "type": "string"
                         },
+                        "ForceEndpointErrorConfiguration": {
+                            "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration"
+                        },
                         "HlsManifests": {
                             "items": {
                                 "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration"
@@ -132378,6 +140094,7 @@ var SamSchema = `{
                     "required": [
                         "ChannelGroupName",
                         "ChannelName",
+                        "ContainerType",
                         "OriginEndpointName"
                     ],
                     "type": "object"
@@ -132403,6 +140120,63 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DrmSignaling": {
+                    "type": "string"
+                },
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.FilterConfiguration"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScteDash": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ScteDash"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming"
+                }
+            },
+            "required": [
+                "ManifestName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming": {
+            "additionalProperties": false,
+            "properties": {
+                "TimingMode": {
+                    "type": "string"
+                },
+                "TimingSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -132471,6 +140245,18 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointErrorConditions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -132543,6 +140329,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ScteDash": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkerDash": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.ScteHls": {
             "additionalProperties": false,
             "properties": {
@@ -133335,6 +141130,9 @@ var SamSchema = `{
         "AWS::MediaTailor::PlaybackConfiguration.AvailSuppression": {
             "additionalProperties": false,
             "properties": {
+                "FillPolicy": {
+                    "type": "string"
+                },
                 "Mode": {
                     "type": "string"
                 },
@@ -134188,102 +141986,312 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AssociatedRoles": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
-                            },
-                            "type": "array"
-                        },
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BackupRetentionPeriod": {
-                            "type": "number"
-                        },
-                        "CopyTagsToSnapshot": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBInstanceParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBPort": {
+                            "type": "number"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ServerlessScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBClusterParameterGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBInstance": {
+            "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": {
+                        "AllowMajorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBClusterParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBInstanceParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBPort": {
-                            "type": "number"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
-                        },
-                        "DeletionProtection": {
+                        "AutoMinorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "EnableCloudwatchLogsExports": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "EngineVersion": {
+                        "AvailabilityZone": {
                             "type": "string"
                         },
-                        "IamAuthEnabled": {
-                            "type": "boolean"
-                        },
-                        "KmsKeyId": {
+                        "DBClusterIdentifier": {
                             "type": "string"
                         },
-                        "PreferredBackupWindow": {
+                        "DBInstanceClass": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
+                        "DBInstanceIdentifier": {
                             "type": "string"
                         },
-                        "RestoreToTime": {
+                        "DBParameterGroupName": {
                             "type": "string"
                         },
-                        "RestoreType": {
+                        "DBSnapshotIdentifier": {
                             "type": "string"
                         },
-                        "ServerlessScalingConfiguration": {
-                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
-                        },
-                        "SnapshotIdentifier": {
+                        "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "SourceDBClusterIdentifier": {
+                        "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
-                        "StorageEncrypted": {
-                            "type": "boolean"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UseLatestRestorableTime": {
-                            "type": "boolean"
-                        },
-                        "VpcSecurityGroupIds": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBCluster"
+                        "AWS::Neptune::DBInstance"
                     ],
                     "type": "string"
                 },
@@ -134297,42 +142305,12 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.DBClusterRole": {
-            "additionalProperties": false,
-            "properties": {
-                "FeatureName": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RoleArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxCapacity": {
-                    "type": "number"
-                },
-                "MinCapacity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "MaxCapacity",
-                "MinCapacity"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBClusterParameterGroup": {
+        "AWS::Neptune::DBParameterGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134395,7 +142373,7 @@ var SamSchema = `{
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBClusterParameterGroup"
+                        "AWS::Neptune::DBParameterGroup"
                     ],
                     "type": "string"
                 },
@@ -134414,7 +142392,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBInstance": {
+        "AWS::Neptune::DBSubnetGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134449,115 +142427,17 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowMajorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AutoMinorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AvailabilityZone": {
-                            "type": "string"
-                        },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBInstanceClass": {
-                            "type": "string"
-                        },
-                        "DBInstanceIdentifier": {
-                            "type": "string"
-                        },
-                        "DBParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBSnapshotIdentifier": {
+                        "DBSubnetGroupDescription": {
                             "type": "string"
                         },
                         "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DBInstanceClass"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Neptune::DBInstance"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBParameterGroup": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
+                        "SubnetIds": {
                             "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
                                 "type": "string"
                             },
                             "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Family": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "type": "object"
                         },
                         "Tags": {
                             "items": {
@@ -134567,15 +142447,14 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "Description",
-                        "Family",
-                        "Parameters"
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBParameterGroup"
+                        "AWS::Neptune::DBSubnetGroup"
                     ],
                     "type": "string"
                 },
@@ -134594,7 +142473,7 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBSubnetGroup": {
+        "AWS::Neptune::EventSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134629,34 +142508,33 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DBSubnetGroupDescription": {
-                            "type": "string"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
+                        "Enabled": {
+                            "type": "boolean"
                         },
-                        "SubnetIds": {
+                        "EventCategories": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Tags": {
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DBSubnetGroupDescription",
-                        "SubnetIds"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBSubnetGroup"
+                        "AWS::Neptune::EventSubscription"
                     ],
                     "type": "string"
                 },
@@ -134670,8 +142548,7 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -135137,6 +143014,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts": {
+            "additionalProperties": false,
+            "properties": {
+                "TcpIdleTimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::FirewallPolicy.IPSet": {
             "additionalProperties": false,
             "properties": {
@@ -135182,6 +143068,9 @@ var SamSchema = `{
         "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
             "additionalProperties": false,
             "properties": {
+                "FlowTimeouts": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts"
+                },
                 "RuleOrder": {
                     "type": "string"
                 },
@@ -136087,39 +143976,311 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CoreNetworkId": {
+                        "CoreNetworkId": {
+                            "type": "string"
+                        },
+                        "EdgeLocation": {
+                            "type": "string"
+                        },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange"
+                        },
+                        "ProposedSegmentChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CoreNetworkId",
+                        "EdgeLocation",
+                        "Options",
+                        "TransportAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "SegmentName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer": {
+            "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": {
+                        "BgpOptions": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
+                        },
+                        "ConnectAttachmentId": {
+                            "type": "string"
+                        },
+                        "CoreNetworkAddress": {
+                            "type": "string"
+                        },
+                        "InsideCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PeerAddress": {
+                            "type": "string"
+                        },
+                        "SubnetArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectAttachmentId",
+                        "PeerAddress"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectPeer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "CoreNetworkAsn": {
+                    "type": "number"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BgpConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
+                    },
+                    "type": "array"
+                },
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "InsideCidrBlocks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::CoreNetwork": {
+            "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": {
+                        "Description": {
                             "type": "string"
                         },
-                        "EdgeLocation": {
+                        "GlobalNetworkId": {
                             "type": "string"
                         },
-                        "Options": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
-                        },
-                        "ProposedSegmentChange": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        "PolicyDocument": {
+                            "type": "object"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TransportAttachmentId": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "CoreNetworkId",
-                        "EdgeLocation",
-                        "Options",
-                        "TransportAttachmentId"
+                        "GlobalNetworkId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::NetworkManager::ConnectAttachment"
+                        "AWS::NetworkManager::CoreNetwork"
                     ],
                     "type": "string"
                 },
@@ -136138,264 +144299,55 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "Protocol": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
             "additionalProperties": false,
             "properties": {
-                "AttachmentPolicyRuleNumber": {
+                "Asn": {
                     "type": "number"
                 },
-                "SegmentName": {
+                "EdgeLocation": {
                     "type": "string"
                 },
-                "Tags": {
+                "InsideCidrBlocks": {
                     "items": {
-                        "$ref": "#/definitions/Tag"
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectPeer": {
-            "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": {
-                        "BgpOptions": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
-                        },
-                        "ConnectAttachmentId": {
-                            "type": "string"
-                        },
-                        "CoreNetworkAddress": {
-                            "type": "string"
-                        },
-                        "InsideCidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "PeerAddress": {
-                            "type": "string"
-                        },
-                        "SubnetArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "ConnectAttachmentId",
-                        "PeerAddress"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::ConnectPeer"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "CoreNetworkAsn": {
-                    "type": "number"
-                },
-                "PeerAddress": {
-                    "type": "string"
-                },
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup": {
             "additionalProperties": false,
             "properties": {
-                "BgpConfigurations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
-                    },
-                    "type": "array"
-                },
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "InsideCidrBlocks": {
+                "EdgeLocations": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "PeerAddress": {
+                "Name": {
                     "type": "string"
                 },
-                "Protocol": {
-                    "type": "string"
+                "Segments": {
+                    "$ref": "#/definitions/AWS::NetworkManager::CoreNetwork.Segments"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
             "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "GlobalNetworkId": {
-                            "type": "string"
-                        },
-                        "PolicyDocument": {
-                            "type": "object"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "EdgeLocations": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "GlobalNetworkId"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::CoreNetwork"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
-            "additionalProperties": false,
-            "properties": {
-                "Asn": {
-                    "type": "number"
+                    "type": "array"
                 },
-                "EdgeLocation": {
+                "Name": {
                     "type": "string"
                 },
-                "InsideCidrBlocks": {
+                "SharedSegments": {
                     "items": {
                         "type": "string"
                     },
@@ -136404,19 +144356,16 @@ var SamSchema = `{
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
+        "AWS::NetworkManager::CoreNetwork.Segments": {
             "additionalProperties": false,
             "properties": {
-                "EdgeLocations": {
+                "SendTo": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Name": {
-                    "type": "string"
-                },
-                "SharedSegments": {
+                "SendVia": {
                     "items": {
                         "type": "string"
                     },
@@ -136999,6 +144948,12 @@ var SamSchema = `{
                         "CoreNetworkId": {
                             "type": "string"
                         },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange"
                         },
@@ -137039,6 +144994,24 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137236,9 +145209,15 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
                         "PeeringId": {
                             "type": "string"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange"
                         },
@@ -137279,6 +145258,24 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137338,6 +145335,9 @@ var SamSchema = `{
                         "Options": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.VpcOptions"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedSegmentChange"
                         },
@@ -137385,6 +145385,24 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::VpcAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -138201,6 +146219,22 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::OSIS::Pipeline.VpcAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachToVpc": {
+                    "type": "boolean"
+                },
+                "CidrBlock": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachToVpc",
+                "CidrBlock"
+            ],
+            "type": "object"
+        },
         "AWS::OSIS::Pipeline.VpcEndpoint": {
             "additionalProperties": false,
             "properties": {
@@ -138230,6 +146264,12 @@ var SamSchema = `{
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "VpcAttachmentOptions": {
+                    "$ref": "#/definitions/AWS::OSIS::Pipeline.VpcAttachmentOptions"
+                },
+                "VpcEndpointManagement": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -139640,6 +147680,9 @@ var SamSchema = `{
                         "OffPeakWindowOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.OffPeakWindowOptions"
                         },
+                        "SkipShardMigrationWait": {
+                            "type": "boolean"
+                        },
                         "SnapshotOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
                         },
@@ -139693,6 +147736,9 @@ var SamSchema = `{
                 "InternalUserDatabaseEnabled": {
                     "type": "boolean"
                 },
+                "JWTOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.JWTOptions"
+                },
                 "MasterUserOptions": {
                     "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
                 },
@@ -139841,6 +147887,24 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::OpenSearchService::Domain.JWTOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "PublicKey": {
+                    "type": "string"
+                },
+                "RolesKey": {
+                    "type": "string"
+                },
+                "SubjectKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::OpenSearchService::Domain.LogPublishingOption": {
             "additionalProperties": false,
             "properties": {
@@ -142780,6 +150844,200 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::PCAConnectorSCEP::Challenge": {
+            "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": {
+                        "ConnectorArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConnectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Challenge"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector": {
+            "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": {
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "MobileDeviceManagement": {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Connector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.IntuneConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AzureApplicationId": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AzureApplicationId",
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "Intune": {
+                    "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.IntuneConfiguration"
+                }
+            },
+            "required": [
+                "Intune"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Panorama::ApplicationInstance": {
             "additionalProperties": false,
             "properties": {
@@ -146771,6 +155029,9 @@ var SamSchema = `{
                         "EnrichmentParameters": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeEnrichmentParameters"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "LogConfiguration": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeLogConfiguration"
                         },
@@ -146975,6 +155236,26 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValue": {
+                    "type": "string"
+                },
+                "DimensionValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName",
+                "DimensionValue",
+                "DimensionValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.EcsContainerOverride": {
             "additionalProperties": false,
             "properties": {
@@ -147172,6 +155453,45 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValue",
+                "MeasureValueType",
+                "MultiMeasureAttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Pipes::Pipe.MultiMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings",
+                "MultiMeasureName"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.NetworkConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -147702,6 +156022,9 @@ var SamSchema = `{
                 },
                 "StepFunctionStateMachineParameters": {
                     "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetStateMachineParameters"
+                },
+                "TimestreamParameters": {
+                    "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetTimestreamParameters"
                 }
             },
             "type": "object"
@@ -147770,6 +156093,50 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.PipeTargetTimestreamParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "EpochTimeUnit": {
+                    "type": "string"
+                },
+                "MultiMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "SingleMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.SingleMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "TimeFieldType": {
+                    "type": "string"
+                },
+                "TimeValue": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                },
+                "VersionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionMappings",
+                "TimeValue",
+                "VersionValue"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.PlacementConstraint": {
             "additionalProperties": false,
             "properties": {
@@ -147864,6 +156231,26 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.SingleMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureName",
+                "MeasureValue",
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Proton::EnvironmentAccountConnection": {
             "additionalProperties": false,
             "properties": {
@@ -148104,6 +156491,975 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QBusiness::Application": {
+            "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": {
+                        "AttachmentsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AttachmentsConfiguration"
+                        },
+                        "AutoSubscriptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AutoSubscriptionConfiguration"
+                        },
+                        "ClientIdsForOIDC": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.EncryptionConfiguration"
+                        },
+                        "IamIdentityProviderArn": {
+                            "type": "string"
+                        },
+                        "IdentityCenterInstanceArn": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "PersonalizationConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.PersonalizationConfiguration"
+                        },
+                        "QAppsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.QAppsConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AttachmentsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachmentsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AutoSubscriptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoSubscribe": {
+                    "type": "string"
+                },
+                "DefaultSubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoSubscribe"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.PersonalizationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PersonalizationControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PersonalizationControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.QAppsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QAppsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QAppsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentEnrichmentConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SyncSchedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DataSourceVpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "IndexId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeValueOperator": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DateValue": {
+                    "type": "string"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringListValue": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InlineConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration"
+                    },
+                    "type": "array"
+                },
+                "PostExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                },
+                "PreExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.HookConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InvocationCondition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "DocumentContentOperator": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CapacityConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Index.IndexCapacityConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentAttributeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QBusiness::Index.DocumentAttributeConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.DocumentAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Search": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexCapacityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "TextDocumentStatistics": {
+                    "$ref": "#/definitions/AWS::QBusiness::Index.TextDocumentStatistics"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.TextDocumentStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexedTextBytes": {
+                    "type": "number"
+                },
+                "IndexedTextDocumentCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "AuthConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.PluginAuthConfiguration"
+                        },
+                        "CustomPluginConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.CustomPluginConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ServerUrl": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "AuthConfiguration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Plugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.APISchema": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.BasicAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.CustomPluginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSchema": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.APISchema"
+                },
+                "ApiSchemaType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSchema",
+                "ApiSchemaType",
+                "Description"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.PluginAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.BasicAuthConfiguration"
+                },
+                "NoAuthConfiguration": {
+                    "type": "object"
+                },
+                "OAuth2ClientCredentialConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever.RetrieverConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Retriever"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.KendraIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.NativeIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.RetrieverConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KendraIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.KendraIndexConfiguration"
+                },
+                "NativeIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.NativeIndexConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "IdentityProviderConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience.IdentityProviderConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SamplePromptsControlMode": {
+                            "type": "string"
+                        },
+                        "Subtitle": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Title": {
+                            "type": "string"
+                        },
+                        "WelcomeMessage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::WebExperience"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.IdentityProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OpenIDConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration"
+                },
+                "SamlConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.SamlProviderConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsArn": {
+                    "type": "string"
+                },
+                "SecretsRole": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretsArn",
+                "SecretsRole"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.SamlProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthenticationUrl"
+            ],
+            "type": "object"
+        },
         "AWS::QLDB::Ledger": {
             "additionalProperties": false,
             "properties": {
@@ -148489,6 +157845,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.SheetDefinition"
@@ -149283,6 +158642,25 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -149436,6 +158814,9 @@ var SamSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149520,6 +158901,9 @@ var SamSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ComboChartSortConfiguration"
                 },
@@ -150537,6 +159921,9 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -150592,6 +159979,9 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -150682,6 +160072,9 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 }
@@ -151013,6 +160406,9 @@ var SamSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -151169,6 +160565,9 @@ var SamSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.NumericEqualityFilter"
                 },
@@ -151242,6 +160641,9 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -151271,6 +160673,9 @@ var SamSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -151416,6 +160821,9 @@ var SamSchema = `{
         "AWS::QuickSight::Analysis.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 },
@@ -152621,6 +162029,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153134,6 +162551,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.SmallMultiplesOptions"
                 },
@@ -153496,6 +162916,30 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153882,6 +163326,9 @@ var SamSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -154728,6 +164175,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -155758,6 +165214,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157132,6 +166597,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -157141,6 +166615,9 @@ var SamSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DataLabelOptions"
                 },
@@ -157177,6 +166654,21 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157387,6 +166879,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard": {
             "additionalProperties": false,
             "properties": {
@@ -158296,6 +167800,25 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -158449,6 +167972,9 @@ var SamSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -158533,6 +168059,9 @@ var SamSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ComboChartSortConfiguration"
                 },
@@ -159767,6 +169296,9 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -159822,6 +169354,9 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -159912,6 +169447,9 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 }
@@ -160270,6 +169808,9 @@ var SamSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -160426,6 +169967,9 @@ var SamSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.NumericEqualityFilter"
                 },
@@ -160499,6 +170043,9 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -160528,6 +170075,9 @@ var SamSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -160673,6 +170223,9 @@ var SamSchema = `{
         "AWS::QuickSight::Dashboard.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 },
@@ -161878,6 +171431,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -162391,6 +171953,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.SmallMultiplesOptions"
                 },
@@ -162765,6 +172330,30 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -163151,6 +172740,9 @@ var SamSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -165045,6 +174637,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166437,6 +176038,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -166446,6 +176056,9 @@ var SamSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataLabelOptions"
                 },
@@ -166482,6 +176095,21 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166692,6 +176320,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSet": {
             "additionalProperties": false,
             "properties": {
@@ -166766,6 +176406,12 @@ var SamSchema = `{
                             },
                             "type": "object"
                         },
+                        "FolderArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "ImportMode": {
                             "type": "string"
                         },
@@ -167134,6 +176780,9 @@ var SamSchema = `{
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.LookbackWindow"
                 }
             },
+            "required": [
+                "LookbackWindow"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
@@ -167258,8 +176907,7 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Alias",
-                "Source"
+                "Alias"
             ],
             "type": "object"
         },
@@ -167291,6 +176939,11 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Size",
+                "SizeUnit"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.NewDefaultValues": {
@@ -167396,6 +177049,9 @@ var SamSchema = `{
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.IncrementalRefresh"
                 }
             },
+            "required": [
+                "IncrementalRefresh"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.RelationalTable": {
@@ -167629,8 +177285,30 @@ var SamSchema = `{
                 },
                 "TagColumnOperation": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                },
+                "UntagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UntagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UntagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "TagNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "TagNames"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.UploadSettings": {
@@ -167735,6 +177413,10 @@ var SamSchema = `{
                             "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -167753,7 +177435,8 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -167968,6 +177651,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.IdentityCenterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableIdentityPropagation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -168100,6 +177792,30 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.RedshiftIAMParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoCreateDatabaseUser": {
+                    "type": "boolean"
+                },
+                "DatabaseGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DatabaseUser": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.RedshiftParameters": {
             "additionalProperties": false,
             "properties": {
@@ -168112,6 +177828,12 @@ var SamSchema = `{
                 "Host": {
                     "type": "string"
                 },
+                "IAMParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftIAMParameters"
+                },
+                "IdentityCenterConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.IdentityCenterConfiguration"
+                },
                 "Port": {
                     "type": "number"
                 }
@@ -168132,6 +177854,9 @@ var SamSchema = `{
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -168295,6 +178020,113 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Folder": {
+            "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": {
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "FolderId": {
+                            "type": "string"
+                        },
+                        "FolderType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentFolderArn": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Folder.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SharingModel": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Folder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Folder.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::RefreshSchedule": {
             "additionalProperties": false,
             "properties": {
@@ -169291,6 +179123,25 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -169483,6 +179334,9 @@ var SamSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -169567,6 +179421,9 @@ var SamSchema = `{
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ComboChartSortConfiguration"
                 },
@@ -170560,6 +180417,9 @@ var SamSchema = `{
         "AWS::QuickSight::Template.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -170615,6 +180475,9 @@ var SamSchema = `{
         "AWS::QuickSight::Template.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -170705,6 +180568,9 @@ var SamSchema = `{
         "AWS::QuickSight::Template.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 }
@@ -171036,6 +180902,9 @@ var SamSchema = `{
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -171192,6 +181061,9 @@ var SamSchema = `{
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.NumericEqualityFilter"
                 },
@@ -171265,6 +181137,9 @@ var SamSchema = `{
         "AWS::QuickSight::Template.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -171294,6 +181169,9 @@ var SamSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -171439,6 +181317,9 @@ var SamSchema = `{
         "AWS::QuickSight::Template.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 },
@@ -172644,6 +182525,15 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173138,6 +183028,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.SmallMultiplesOptions"
                 },
@@ -173500,6 +183393,30 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173886,6 +183803,9 @@ var SamSchema = `{
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -174702,6 +184622,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -175732,6 +185661,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -176467,6 +186405,9 @@ var SamSchema = `{
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.SheetDefinition"
@@ -177241,6 +187182,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -177250,6 +187200,9 @@ var SamSchema = `{
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DataLabelOptions"
                 },
@@ -177286,6 +187239,21 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -177496,6 +187464,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Theme": {
             "additionalProperties": false,
             "properties": {
@@ -178227,6 +188207,9 @@ var SamSchema = `{
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "Expression": {
                     "type": "string"
                 },
@@ -178333,6 +188316,9 @@ var SamSchema = `{
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "IsIncludedInTopic": {
                     "type": "boolean"
                 },
@@ -179018,9 +189004,15 @@ var SamSchema = `{
                         "EnableIAMDatabaseAuthentication": {
                             "type": "boolean"
                         },
+                        "EnableLocalWriteForwarding": {
+                            "type": "boolean"
+                        },
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineMode": {
                             "type": "string"
                         },
@@ -179470,6 +189462,9 @@ var SamSchema = `{
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180506,6 +190501,9 @@ var SamSchema = `{
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180517,6 +190515,12 @@ var SamSchema = `{
                         },
                         "StorageEncrypted": {
                             "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "type": "object"
@@ -181225,6 +191229,15 @@ var SamSchema = `{
                 "BucketName": {
                     "type": "string"
                 },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogExports": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "S3KeyPrefix": {
                     "type": "string"
                 }
@@ -184646,6 +194659,15 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AcceptRoleSessionName": {
+                            "type": "boolean"
+                        },
+                        "AttributeMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RolesAnywhere::Profile.AttributeMapping"
+                            },
+                            "type": "array"
+                        },
                         "DurationSeconds": {
                             "type": "number"
                         },
@@ -184707,6 +194729,37 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::RolesAnywhere::Profile.AttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateField": {
+                    "type": "string"
+                },
+                "MappingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RolesAnywhere::Profile.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateField",
+                "MappingRules"
+            ],
+            "type": "object"
+        },
+        "AWS::RolesAnywhere::Profile.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Specifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Specifier"
+            ],
+            "type": "object"
+        },
         "AWS::RolesAnywhere::TrustAnchor": {
             "additionalProperties": false,
             "properties": {
@@ -186938,6 +196991,9 @@ var SamSchema = `{
                 "FirewallDomainListId": {
                     "type": "string"
                 },
+                "FirewallDomainRedirectionAction": {
+                    "type": "string"
+                },
                 "Priority": {
                     "type": "number"
                 },
@@ -187533,6 +197589,9 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DelegationRecord": {
+                            "type": "string"
+                        },
                         "DomainName": {
                             "type": "string"
                         },
@@ -187559,7 +197618,6 @@ var SamSchema = `{
                         }
                     },
                     "required": [
-                        "DomainName",
                         "RuleType"
                     ],
                     "type": "object"
@@ -188497,6 +198555,9 @@ var SamSchema = `{
                         "$ref": "#/definitions/AWS::S3::Bucket.Rule"
                     },
                     "type": "array"
+                },
+                "TransitionDefaultMinimumObjectSize": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -190113,6 +200174,9 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.BucketEncryption"
+                        },
                         "BucketName": {
                             "type": "string"
                         },
@@ -190145,11 +200209,53 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
             ],
             "type": "object"
         },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
         "AWS::S3ObjectLambda::AccessPoint": {
             "additionalProperties": false,
             "properties": {
@@ -191163,6 +201269,18 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventBusArn"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
             "additionalProperties": false,
             "properties": {
@@ -191172,6 +201290,9 @@ var SamSchema = `{
                 "Enabled": {
                     "type": "boolean"
                 },
+                "EventBridgeDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination"
+                },
                 "KinesisFirehoseDestination": {
                     "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
                 },
@@ -191518,6 +201639,1175 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::SES::MailManagerAddonInstance": {
+            "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": {
+                        "AddonSubscriptionId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonSubscriptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerAddonSubscription": {
+            "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": {
+                        "AddonName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive": {
+            "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": {
+                        "ArchiveName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Retention": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive.ArchiveRetention"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerArchive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive.ArchiveRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "RetentionPeriod": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RetentionPeriod"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint": {
+            "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": {
+                        "IngressPointConfiguration": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint.IngressPointConfiguration"
+                        },
+                        "IngressPointName": {
+                            "type": "string"
+                        },
+                        "RuleSetId": {
+                            "type": "string"
+                        },
+                        "StatusToUpdate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RuleSetId",
+                        "TrafficPolicyId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerIngressPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint.IngressPointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SmtpPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay": {
+            "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": {
+                        "Authentication": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay.RelayAuthentication"
+                        },
+                        "RelayName": {
+                            "type": "string"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "ServerName",
+                        "ServerPort"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRelay"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay.RelayAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "NoAuthentication": {
+                    "type": "object"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet": {
+            "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": {
+                        "RuleSetName": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ArchiveAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "TargetArchive": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArchive"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.DeliverToMailboxAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailboxArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MailboxArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RelayAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailFrom": {
+                    "type": "string"
+                },
+                "Relay": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Relay"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ReplaceRecipientAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplaceWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleAction"
+                    },
+                    "type": "array"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Unless": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeader": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.AddHeaderAction"
+                },
+                "Archive": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ArchiveAction"
+                },
+                "DeliverToMailbox": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.DeliverToMailboxAction"
+                },
+                "Drop": {
+                    "type": "object"
+                },
+                "Relay": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RelayAction"
+                },
+                "ReplaceRecipient": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ReplaceRecipientAction"
+                },
+                "Send": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.SendAction"
+                },
+                "WriteToS3": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.S3Action"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanExpression"
+                },
+                "DmarcExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleDmarcExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpExpression"
+                },
+                "NumberExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberExpression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringExpression"
+                },
+                "VerdictExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleDmarcExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MimeHeaderAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Analysis"
+                },
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                },
+                "S3SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.SendAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy": {
+            "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": {
+                        "DefaultAction": {
+                            "type": "string"
+                        },
+                        "MaxMessageSizeBytes": {
+                            "type": "number"
+                        },
+                        "PolicyStatements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyStatement"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "PolicyStatements"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerTrafficPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressAnalysis"
+                }
+            },
+            "required": [
+                "Analysis"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringExpression"
+                },
+                "TlsExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Conditions"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ReceiptFilter": {
             "additionalProperties": false,
             "properties": {
@@ -191809,6 +203099,9 @@ var SamSchema = `{
                 "BucketName": {
                     "type": "string"
                 },
+                "IamRoleArn": {
+                    "type": "string"
+                },
                 "KmsKeyArn": {
                     "type": "string"
                 },
@@ -194960,6 +206253,342 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SSMQuickSetup::ConfigurationManager": {
+            "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": {
+                        "ConfigurationDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationDefinitions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMQuickSetup::ConfigurationManager"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeploymentAdministrationRoleArn": {
+                    "type": "string"
+                },
+                "LocalDeploymentExecutionRoleName": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "TypeVersion": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.StatusSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "LastUpdatedAt": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StatusDetails": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusMessage": {
+                    "type": "string"
+                },
+                "StatusType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LastUpdatedAt",
+                "StatusType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application": {
+            "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": {
+                        "ApplicationProviderArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PortalOptions": {
+                            "$ref": "#/definitions/AWS::SSO::Application.PortalOptionsConfiguration"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationProviderArn",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application.PortalOptionsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SignInOptions": {
+                    "$ref": "#/definitions/AWS::SSO::Application.SignInOptions"
+                },
+                "Visibility": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSO::Application.SignInOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationUrl": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Origin"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::ApplicationAssignment": {
+            "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"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "PrincipalId",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::ApplicationAssignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::Assignment": {
             "additionalProperties": false,
             "properties": {
@@ -195045,6 +206674,73 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SSO::Instance": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -195182,55 +206878,168 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CustomerManagedPolicyReferences": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InlinePolicy": {
-                            "type": "object"
-                        },
-                        "InstanceArn": {
+                        "CustomerManagedPolicyReferences": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
+                        },
+                        "RelayStateType": {
+                            "type": "string"
+                        },
+                        "SessionDuration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::PermissionSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.PermissionsBoundary": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedPolicyReference": {
+                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                },
+                "ManagedPolicyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::App": {
+            "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": {
+                        "AppName": {
                             "type": "string"
                         },
-                        "ManagedPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
+                        "AppType": {
                             "type": "string"
                         },
-                        "PermissionsBoundary": {
-                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
-                        },
-                        "RelayStateType": {
+                        "DomainId": {
                             "type": "string"
                         },
-                        "SessionDuration": {
-                            "type": "string"
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "InstanceArn",
-                        "Name"
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SSO::PermissionSet"
+                        "AWS::SageMaker::App"
                     ],
                     "type": "string"
                 },
@@ -195249,34 +207058,25 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+        "AWS::SageMaker::App.ResourceSpec": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "InstanceType": {
                     "type": "string"
                 },
-                "Path": {
+                "LifecycleConfigArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::SSO::PermissionSet.PermissionsBoundary": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomerManagedPolicyReference": {
-                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
                 },
-                "ManagedPolicyArn": {
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::App": {
+        "AWS::SageMaker::AppImageConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195311,39 +207111,33 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppName": {
+                        "AppImageConfigName": {
                             "type": "string"
                         },
-                        "AppType": {
-                            "type": "string"
+                        "CodeEditorAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
                         },
-                        "DomainId": {
-                            "type": "string"
+                        "JupyterLabAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
                         },
-                        "ResourceSpec": {
-                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserProfileName": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "AppName",
-                        "AppType",
-                        "DomainId",
-                        "UserProfileName"
+                        "AppImageConfigName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::App"
+                        "AWS::SageMaker::AppImageConfig"
                     ],
                     "type": "string"
                 },
@@ -195362,22 +207156,113 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::App.ResourceSpec": {
+        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceType": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "SageMakerImageArn": {
+                "Value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
                 },
-                "SageMakerImageVersionArn": {
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig": {
+        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
+                },
+                "KernelSpecs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "KernelSpecs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "DisplayName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Cluster": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195412,33 +207297,39 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppImageConfigName": {
+                        "ClusterName": {
                             "type": "string"
                         },
-                        "CodeEditorAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
+                        "InstanceGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceGroup"
+                            },
+                            "type": "array"
                         },
-                        "JupyterLabAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
+                        "NodeRecovery": {
+                            "type": "string"
                         },
-                        "KernelGatewayImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        "Orchestrator": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.Orchestrator"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppImageConfigName"
+                        "InstanceGroups"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::AppImageConfig"
+                        "AWS::SageMaker::Cluster"
                     ],
                     "type": "string"
                 },
@@ -195457,109 +207348,129 @@ var SamSchema = `{
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterEbsVolumeConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "VolumeSizeInGB": {
+                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+        "AWS::SageMaker::Cluster.ClusterInstanceGroup": {
             "additionalProperties": false,
             "properties": {
-                "ContainerArguments": {
+                "CurrentCount": {
+                    "type": "number"
+                },
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceGroupName": {
+                    "type": "string"
+                },
+                "InstanceStorageConfigs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceStorageConfig"
                     },
                     "type": "array"
                 },
-                "ContainerEntrypoint": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LifeCycleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterLifeCycleConfig"
+                },
+                "OnStartDeepHealthChecks": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "ContainerEnvironmentVariables": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
-                    },
-                    "type": "array"
+                "ThreadsPerCore": {
+                    "type": "number"
                 }
             },
+            "required": [
+                "ExecutionRole",
+                "InstanceCount",
+                "InstanceGroupName",
+                "InstanceType",
+                "LifeCycleConfig"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+        "AWS::SageMaker::Cluster.ClusterInstanceStorageConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "EbsVolumeConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterEbsVolumeConfig"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+        "AWS::SageMaker::Cluster.ClusterLifeCycleConfig": {
             "additionalProperties": false,
             "properties": {
-                "DefaultGid": {
-                    "type": "number"
-                },
-                "DefaultUid": {
-                    "type": "number"
+                "OnCreate": {
+                    "type": "string"
                 },
-                "MountPath": {
+                "SourceS3Uri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "OnCreate",
+                "SourceS3Uri"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "ClusterArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ClusterArn"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+        "AWS::SageMaker::Cluster.Orchestrator": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
-                },
-                "KernelSpecs": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
-                    },
-                    "type": "array"
+                "Eks": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig"
                 }
             },
             "required": [
-                "KernelSpecs"
+                "Eks"
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+        "AWS::SageMaker::Cluster.VpcConfig": {
             "additionalProperties": false,
             "properties": {
-                "DisplayName": {
-                    "type": "string"
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Name": {
-                    "type": "string"
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name"
+                "SecurityGroupIds",
+                "Subnets"
             ],
             "type": "object"
         },
@@ -196355,9 +208266,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
@@ -196451,9 +208374,21 @@ var SamSchema = `{
         "AWS::SageMaker::Domain.DefaultSpaceSettings": {
             "additionalProperties": false,
             "properties": {
+                "CustomFileSystemConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomFileSystemConfig"
+                    },
+                    "type": "array"
+                },
+                "CustomPosixUserConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.CustomPosixUserConfig"
+                },
                 "ExecutionRole": {
                     "type": "string"
                 },
+                "JupyterLabAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterLabAppSettings"
+                },
                 "JupyterServerAppSettings": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
                 },
@@ -196465,6 +208400,9 @@ var SamSchema = `{
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "SpaceStorageSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.DefaultSpaceStorageSettings"
                 }
             },
             "required": [
@@ -196529,9 +208467,30 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CodeRepository"
@@ -196561,6 +208520,12 @@ var SamSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196576,6 +208541,12 @@ var SamSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196661,6 +208632,24 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Domain.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -196711,6 +208700,9 @@ var SamSchema = `{
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.StudioWebPortalSettings"
                 }
             },
             "required": [
@@ -197795,6 +209787,9 @@ var SamSchema = `{
                         },
                         "VendorGuidance": {
                             "type": "string"
+                        },
+                        "Version": {
+                            "type": "number"
                         }
                     },
                     "required": [
@@ -198282,6 +210277,97 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::MlflowTrackingServer": {
+            "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": {
+                        "ArtifactStoreUri": {
+                            "type": "string"
+                        },
+                        "AutomaticModelRegistration": {
+                            "type": "boolean"
+                        },
+                        "MlflowVersion": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingServerName": {
+                            "type": "string"
+                        },
+                        "TrackingServerSize": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ArtifactStoreUri",
+                        "RoleArn",
+                        "TrackingServerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MlflowTrackingServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model": {
             "additionalProperties": false,
             "properties": {
@@ -198370,6 +210456,22 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Model.AdditionalModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.S3DataSource"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "S3DataSource"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ContainerDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -198406,6 +210508,18 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Model.HubAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HubContentArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HubContentArn"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ImageConfig": {
             "additionalProperties": false,
             "properties": {
@@ -198484,6 +210598,9 @@ var SamSchema = `{
                 "CompressionType": {
                     "type": "string"
                 },
+                "HubAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.HubAccessConfig"
+                },
                 "ModelAccessConfig": {
                     "$ref": "#/definitions/AWS::SageMaker::Model.ModelAccessConfig"
                 },
@@ -200005,6 +212122,9 @@ var SamSchema = `{
                         "ModelApprovalStatus": {
                             "type": "string"
                         },
+                        "ModelCard": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelCard"
+                        },
                         "ModelMetrics": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelMetrics"
                         },
@@ -200026,12 +212146,18 @@ var SamSchema = `{
                         "SamplePayloadUrl": {
                             "type": "string"
                         },
+                        "SecurityConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SecurityConfig"
+                        },
                         "SkipModelValidation": {
                             "type": "string"
                         },
                         "SourceAlgorithmSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SourceAlgorithmSpecification"
                         },
+                        "SourceUri": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -200314,6 +212440,34 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceptEula": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AcceptEula"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.ModelCard": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCardContent": {
+                    "type": "string"
+                },
+                "ModelCardStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ModelCardContent",
+                "ModelCardStatus"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelDataQuality": {
             "additionalProperties": false,
             "properties": {
@@ -200326,6 +212480,15 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.S3ModelDataSource"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelInput": {
             "additionalProperties": false,
             "properties": {
@@ -200383,6 +212546,9 @@ var SamSchema = `{
                 "ImageDigest": {
                     "type": "string"
                 },
+                "ModelDataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelDataSource"
+                },
                 "ModelDataUrl": {
                     "type": "string"
                 },
@@ -200457,6 +212623,41 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.S3ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionType": {
+                    "type": "string"
+                },
+                "ModelAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelAccessConfig"
+                },
+                "S3DataType": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionType",
+                "S3DataType",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.SecurityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKeyId"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.SourceAlgorithm": {
             "additionalProperties": false,
             "properties": {
@@ -202279,6 +214480,12 @@ var SamSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202294,6 +214501,12 @@ var SamSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202316,6 +214529,9 @@ var SamSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202325,18 +214541,42 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceAppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceIdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceCodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
                 }
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceIdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceJupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Space.CodeRepository"
@@ -202400,6 +214640,85 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::StudioLifecycleConfig": {
+            "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": {
+                        "StudioLifecycleConfigAppType": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigContent": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StudioLifecycleConfigAppType",
+                        "StudioLifecycleConfigContent",
+                        "StudioLifecycleConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::StudioLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile": {
             "additionalProperties": false,
             "properties": {
@@ -202484,9 +214803,21 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
@@ -202601,9 +214932,30 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CodeRepository"
@@ -202633,6 +214985,12 @@ var SamSchema = `{
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202648,6 +215006,12 @@ var SamSchema = `{
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202670,6 +215034,9 @@ var SamSchema = `{
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202694,6 +215061,24 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -202741,6 +215126,9 @@ var SamSchema = `{
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.StudioWebPortalSettings"
                 }
             },
             "type": "object"
@@ -203810,6 +216198,13 @@ var SamSchema = `{
                             "type": "object"
                         }
                     },
+                    "required": [
+                        "Actions",
+                        "Criteria",
+                        "Description",
+                        "RuleName",
+                        "RuleOrder"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -203828,7 +216223,8 @@ var SamSchema = `{
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -204250,6 +216646,210 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::ConfigurationPolicy": {
+            "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": {
+                        "ConfigurationPolicy": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.Policy"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicy",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ConfigurationPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityHub": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecurityControlId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EnabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlCustomParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledStandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlsConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration"
+                },
+                "ServiceEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::DelegatedAdmin": {
             "additionalProperties": false,
             "properties": {
@@ -204315,6 +216915,77 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::FindingAggregator": {
+            "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": {
+                        "RegionLinkingMode": {
+                            "type": "string"
+                        },
+                        "Regions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegionLinkingMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::FindingAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
@@ -205176,6 +217847,150 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::OrganizationConfiguration": {
+            "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": {
+                        "AutoEnable": {
+                            "type": "boolean"
+                        },
+                        "AutoEnableStandards": {
+                            "type": "string"
+                        },
+                        "ConfigurationType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoEnable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::OrganizationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::PolicyAssociation": {
+            "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": {
+                        "ConfigurationPolicyId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicyId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::PolicyAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::ProductSubscription": {
             "additionalProperties": false,
             "properties": {
@@ -205211,18 +218026,98 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ProductArn": {
+                        "ProductArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ProductSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl": {
+            "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": {
+                        "LastUpdateReason": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityControlArn": {
+                            "type": "string"
+                        },
+                        "SecurityControlId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ProductArn"
+                        "Parameters"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
+                        "AWS::SecurityHub::SecurityControl"
                     ],
                     "type": "string"
                 },
@@ -205241,6 +218136,60 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::SecurityControl.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
@@ -205690,6 +218639,112 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::SecurityLake::SubscriberNotification": {
+            "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": {
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.NotificationConfiguration"
+                        },
+                        "SubscriberArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationConfiguration",
+                        "SubscriberArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityLake::SubscriberNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationApiKeyName": {
+                    "type": "string"
+                },
+                "AuthorizationApiKeyValue": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "TargetRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "TargetRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpsNotificationConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration"
+                },
+                "SqsNotificationConfiguration": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Serverless::Api": {
             "additionalProperties": false,
             "properties": {
@@ -211377,6 +224432,9 @@ var SamSchema = `{
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity.EncryptionConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -211413,6 +224471,24 @@ var SamSchema = `{
             ],
             "type": "object"
         },
+        "AWS::StepFunctions::Activity.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::Activity.TagsEntry": {
             "additionalProperties": false,
             "properties": {
@@ -211482,6 +224558,9 @@ var SamSchema = `{
                             },
                             "type": "object"
                         },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.EncryptionConfiguration"
+                        },
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
                         },
@@ -211539,6 +224618,24 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::StepFunctions::StateMachine.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::StateMachine.LogDestination": {
             "additionalProperties": false,
             "properties": {
@@ -212073,6 +225170,12 @@ var SamSchema = `{
                         "Name": {
                             "type": "string"
                         },
+                        "ResourcesToReplicateTags": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "RunConfig": {
                             "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
                         },
@@ -212404,6 +225507,9 @@ var SamSchema = `{
                             },
                             "type": "array"
                         },
+                        "DatabaseArn": {
+                            "type": "string"
+                        },
                         "Instances": {
                             "items": {
                                 "type": "string"
@@ -213369,6 +226475,9 @@ var SamSchema = `{
                         "LoggingRole": {
                             "type": "string"
                         },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
                         "SftpConfig": {
                             "$ref": "#/definitions/AWS::Transfer::Connector.SftpConfig"
                         },
@@ -214070,6 +227179,10 @@ var SamSchema = `{
                     "type": "string"
                 }
             },
+            "required": [
+                "DestinationFileLocation",
+                "Type"
+            ],
             "type": "object"
         },
         "AWS::Transfer::Workflow.DeleteStepDetails": {
@@ -214297,13 +227410,93 @@ var SamSchema = `{
             "properties": {
                 "CognitoUserPoolConfiguration": {
                     "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                },
+                "OpenIdConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audiences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdPrefix": {
+                    "type": "string"
+                },
+                "GroupConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "TokenSelection": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection"
                 }
             },
             "required": [
-                "CognitoUserPoolConfiguration"
+                "Issuer",
+                "TokenSelection"
             ],
             "type": "object"
         },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupClaim": {
+                    "type": "string"
+                },
+                "GroupEntityType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupClaim",
+                "GroupEntityType"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration"
+                },
+                "IdentityTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::VerifiedPermissions::Policy": {
             "additionalProperties": false,
             "properties": {
@@ -220997,6 +234190,140 @@ var SamSchema = `{
             },
             "type": "object"
         },
+        "AWS::WorkSpaces::WorkspacesPool": {
+            "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": {
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.ApplicationSettings"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Capacity": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.Capacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.TimeoutSettings"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "Capacity",
+                        "DirectoryId",
+                        "PoolName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::WorkspacesPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SettingsGroup": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.Capacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredUserSessions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredUserSessions"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.TimeoutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "IdleDisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "MaxUserDurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WorkSpacesThinClient::Environment": {
             "additionalProperties": false,
             "properties": {
@@ -221041,6 +234368,12 @@ var SamSchema = `{
                         "DesktopEndpoint": {
                             "type": "string"
                         },
+                        "DeviceCreationTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "KmsKeyArn": {
                             "type": "string"
                         },
@@ -221253,6 +234586,12 @@ var SamSchema = `{
                         },
                         "PortalArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -221779,6 +235118,9 @@ var SamSchema = `{
                         "CustomerManagedKey": {
                             "type": "string"
                         },
+                        "DeepLinkAllowed": {
+                            "type": "string"
+                        },
                         "DisconnectTimeoutInMinutes": {
                             "type": "number"
                         },
@@ -222807,6 +236149,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::APS::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ARCZonalShift::ZonalAutoshiftConfiguration"
                         },
@@ -223083,6 +236428,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::AppSync::SourceApiAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppTest::TestCase"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
                         },
@@ -223092,6 +236440,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::ApplicationInsights::Application"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Athena::CapacityReservation"
                         },
@@ -223191,12 +236542,30 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Bedrock::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::Guardrail"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::GuardrailVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Prompt"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::PromptVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::BillingConductor::BillingGroup"
                         },
@@ -223257,6 +236626,12 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::Membership"
                         },
@@ -223533,6 +236908,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Config::StoredQuery"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::AgentStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::ApprovedOrigin"
                         },
@@ -223596,6 +236974,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::View"
                         },
@@ -223743,18 +237124,30 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::DataZone::Environment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentBlueprintConfiguration"
                         },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentProfile"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::GroupProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::Project"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::SubscriptionTarget"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::UserProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Farm"
                         },
@@ -223767,6 +237160,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Deadline::MeteredProduct"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Deadline::Monitor"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Queue"
                         },
@@ -224496,6 +237892,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Glue::Trigger"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Glue::Workflow"
                         },
@@ -224574,6 +237973,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::IPSet"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan"
+                        },
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::Master"
                         },
@@ -224649,6 +238051,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::IVS::PlaybackRestrictionPolicy"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PublicKey"
+                        },
                         {
                             "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
                         },
@@ -224958,6 +238363,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::KendraRanking::ExecutionPlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::ResourcePolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kinesis::Stream"
                         },
@@ -225045,6 +238453,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Lambda::Version"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::LaunchWizard::Deployment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Lex::Bot"
                         },
@@ -225255,6 +238666,24 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Channel"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Input"
                         },
@@ -225267,6 +238696,15 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Network"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SdiSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SignalMap"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaPackage::Asset"
                         },
@@ -225348,6 +238786,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::EventSubscription"
+                        },
                         {
                             "$ref": "#/definitions/AWS::NeptuneGraph::Graph"
                         },
@@ -225525,6 +238966,12 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::PCAConnectorAD::TemplateGroupAccessControlEntry"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Challenge"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
                         },
@@ -225633,6 +239080,24 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::Proton::ServiceTemplate"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QLDB::Ledger"
                         },
@@ -225651,6 +239116,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::QuickSight::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Folder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QuickSight::RefreshSchedule"
                         },
@@ -225978,6 +239446,27 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SES::EmailIdentity"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SES::ReceiptFilter"
                         },
@@ -226059,9 +239548,21 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::ApplicationAssignment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::Assignment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Instance"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
                         },
@@ -226074,6 +239575,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
                         },
@@ -226110,6 +239614,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::InferenceExperiment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MlflowTrackingServer"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Model"
                         },
@@ -226149,6 +239656,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Space"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::StudioLifecycleConfig"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::UserProfile"
                         },
@@ -226176,18 +239686,33 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::FindingAggregator"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Insight"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::OrganizationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::PolicyAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::SecurityControl"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
@@ -226200,6 +239725,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::SecurityLake::Subscriber"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Serverless::Api"
                         },
@@ -226512,6 +240040,9 @@ var SamSchema = `{
                         {
                             "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool"
+                        },
                         {
                             "$ref": "#/definitions/AWS::WorkSpacesThinClient::Environment"
                         },
diff --git a/schema/sam.schema.json b/schema/sam.schema.json
index 14cef45dc1..11a105a9f6 100644
--- a/schema/sam.schema.json
+++ b/schema/sam.schema.json
@@ -536,6 +536,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.CrlDistributionPointExtensionConfiguration": {
@@ -592,7 +595,6 @@
                 }
             },
             "required": [
-                "NameAssigner",
                 "PartyName"
             ],
             "type": "object"
@@ -670,6 +672,9 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "Enabled"
+            ],
             "type": "object"
         },
         "AWS::ACMPCA::CertificateAuthority.OtherName": {
@@ -1227,6 +1232,71 @@
             },
             "type": "object"
         },
+        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus": {
+            "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": {
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::ARCZonalShift::ZonalAutoshiftConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -1609,11 +1679,9 @@
                         }
                     },
                     "required": [
-                        "AutoMinorVersionUpgrade",
                         "BrokerName",
                         "DeploymentMode",
                         "EngineType",
-                        "EngineVersion",
                         "HostInstanceType",
                         "PubliclyAccessible",
                         "Users"
@@ -1862,7 +1930,6 @@
                     "required": [
                         "Data",
                         "EngineType",
-                        "EngineVersion",
                         "Name"
                     ],
                     "type": "object"
@@ -2036,6 +2103,9 @@
                         "BuildSpec": {
                             "type": "string"
                         },
+                        "CacheConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.CacheConfig"
+                        },
                         "CustomHeaders": {
                             "type": "string"
                         },
@@ -2165,6 +2235,15 @@
             },
             "type": "object"
         },
+        "AWS::Amplify::App.CacheConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Amplify::App.CustomRule": {
             "additionalProperties": false,
             "properties": {
@@ -6484,12 +6563,30 @@
                             "type": "string"
                         },
                         "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "RequestTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         },
                         "ResponseParameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameterMap"
+                                }
+                            },
                             "type": "object"
                         },
                         "TemplateSelectionExpression": {
@@ -6539,13 +6636,9 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "Destination",
-                "Source"
-            ],
             "type": "object"
         },
-        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+        "AWS::ApiGatewayV2::Integration.ResponseParameterMap": {
             "additionalProperties": false,
             "properties": {
                 "ResponseParameters": {
@@ -10100,7 +10193,8 @@
                     "required": [
                         "ApplicationSourceConfig",
                         "Description",
-                        "Name"
+                        "Name",
+                        "Namespace"
                     ],
                     "type": "object"
                 },
@@ -16541,7 +16635,7 @@
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget": {
+        "AWS::AppTest::TestCase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -16576,46 +16670,37 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "MaxCapacity": {
-                            "type": "number"
-                        },
-                        "MinCapacity": {
-                            "type": "number"
-                        },
-                        "ResourceId": {
-                            "type": "string"
-                        },
-                        "RoleARN": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ScalableDimension": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ScheduledActions": {
+                        "Steps": {
                             "items": {
-                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                                "$ref": "#/definitions/AWS::AppTest::TestCase.Step"
                             },
                             "type": "array"
                         },
-                        "ServiceNamespace": {
-                            "type": "string"
-                        },
-                        "SuspendedState": {
-                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "MaxCapacity",
-                        "MinCapacity",
-                        "ResourceId",
-                        "ScalableDimension",
-                        "ServiceNamespace"
+                        "Name",
+                        "Steps"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                        "AWS::AppTest::TestCase"
                     ],
                     "type": "string"
                 },
@@ -16634,62 +16719,542 @@
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+        "AWS::AppTest::TestCase.Batch": {
             "additionalProperties": false,
             "properties": {
-                "MaxCapacity": {
-                    "type": "number"
+                "BatchJobName": {
+                    "type": "string"
                 },
-                "MinCapacity": {
-                    "type": "number"
+                "BatchJobParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "BatchJobName"
+            ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+        "AWS::AppTest::TestCase.CloudFormationAction": {
             "additionalProperties": false,
             "properties": {
-                "EndTime": {
+                "ActionType": {
                     "type": "string"
                 },
-                "ScalableTargetAction": {
-                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.CompareAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Input"
                 },
-                "Schedule": {
+                "Output": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Output"
+                }
+            },
+            "required": [
+                "Input"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ccsid": {
                     "type": "string"
                 },
-                "ScheduledActionName": {
+                "Format": {
                     "type": "string"
                 },
-                "StartTime": {
+                "Length": {
+                    "type": "number"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Timezone": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Schedule",
-                "ScheduledActionName"
+                "Ccsid",
+                "Format",
+                "Length",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+        "AWS::AppTest::TestCase.DatabaseCDC": {
             "additionalProperties": false,
             "properties": {
-                "DynamicScalingInSuspended": {
-                    "type": "boolean"
+                "SourceMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.SourceDatabaseMetadata"
                 },
-                "DynamicScalingOutSuspended": {
-                    "type": "boolean"
+                "TargetMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TargetDatabaseMetadata"
+                }
+            },
+            "required": [
+                "SourceMetadata",
+                "TargetMetadata"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.FileMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppTest::TestCase.DataSet"
+                    },
+                    "type": "array"
                 },
-                "ScheduledScalingSuspended": {
+                "DatabaseCDC": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.DatabaseCDC"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.InputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.InputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileMetadata": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.FileMetadata"
+                },
+                "SourceLocation": {
+                    "type": "string"
+                },
+                "TargetLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileMetadata",
+                "SourceLocation",
+                "TargetLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2ManagedActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ForceStop": {
                     "type": "boolean"
+                },
+                "ImportDataSetLocation": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::ApplicationAutoScaling::ScalingPolicy": {
+        "AWS::AppTest::TestCase.M2ManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.M2NonManagedApplicationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionType": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionType"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeActionProperties"
+                },
+                "Resource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionType",
+                "Resource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DmsTaskArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.MainframeActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "Batch": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Batch"
+                },
+                "Tn3270": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.TN3270"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.OutputFile"
+                }
+            },
+            "required": [
+                "File"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.OutputFile": {
+            "additionalProperties": false,
+            "properties": {
+                "FileLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.ResourceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CloudFormationAction"
+                },
+                "M2ManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2ManagedApplicationAction"
+                },
+                "M2NonManagedApplicationAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.M2NonManagedApplicationAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Script": {
+            "additionalProperties": false,
+            "properties": {
+                "ScriptLocation": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScriptLocation",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.SourceDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.Step": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.StepAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.StepAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CompareAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.CompareAction"
+                },
+                "MainframeAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.MainframeAction"
+                },
+                "ResourceAction": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.ResourceAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TN3270": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportDataSetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Script": {
+                    "$ref": "#/definitions/AWS::AppTest::TestCase.Script"
+                }
+            },
+            "required": [
+                "Script"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TargetDatabaseMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureTool": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureTool",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppTest::TestCase.TestCaseLatestVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Status",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "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": {
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MinCapacity": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScheduledActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "SuspendedState": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+                        }
+                    },
+                    "required": [
+                        "MaxCapacity",
+                        "MinCapacity",
+                        "ResourceId",
+                        "ScalableDimension",
+                        "ServiceNamespace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalableTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "ScalableTargetAction": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+                },
+                "Schedule": {
+                    "type": "string"
+                },
+                "ScheduledActionName": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule",
+                "ScheduledActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicScalingInSuspended": {
+                    "type": "boolean"
+                },
+                "DynamicScalingOutSuspended": {
+                    "type": "boolean"
+                },
+                "ScheduledScalingSuspended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17462,7 +18027,7 @@
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation": {
+        "AWS::ApplicationSignals::ServiceLevelObjective": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -17497,31 +18062,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CapacityAssignmentConfiguration": {
-                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Goal": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Goal"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "RequestBasedSli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli"
+                        },
+                        "Sli": {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Sli"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TargetDpus": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "Name",
-                        "TargetDpus"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Athena::CapacityReservation"
+                        "AWS::ApplicationSignals::ServiceLevelObjective"
                     ],
                     "type": "string"
                 },
@@ -17540,37 +18110,378 @@
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval": {
             "additionalProperties": false,
             "properties": {
-                "WorkgroupNames": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Duration",
+                "DurationUnit",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Goal": {
+            "additionalProperties": false,
+            "properties": {
+                "AttainmentGoal": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Interval"
+                },
+                "WarningThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Interval": {
+            "additionalProperties": false,
+            "properties": {
+                "CalendarInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.CalendarInterval"
+                },
+                "RollingInterval": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Dimension"
                     },
                     "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "WorkgroupNames"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.MetricStat": {
             "additionalProperties": false,
             "properties": {
-                "CapacityAssignments": {
+                "Metric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.Metric"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Stat": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Metric",
+                "Period",
+                "Stat"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "BadCountMetric": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "GoodCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "RequestBasedSliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric"
+                }
+            },
+            "required": [
+                "RequestBasedSliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RequestBasedSliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "MonitoredRequestCountMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MonitoredRequestCountMetric"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "TotalRequestCountMetric": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
                     },
                     "type": "array"
                 }
             },
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.RollingInterval": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "number"
+                },
+                "DurationUnit": {
+                    "type": "string"
+                }
+            },
             "required": [
-                "CapacityAssignments"
+                "Duration",
+                "DurationUnit"
             ],
             "type": "object"
         },
-        "AWS::Athena::DataCatalog": {
+        "AWS::ApplicationSignals::ServiceLevelObjective.Sli": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "MetricThreshold": {
+                    "type": "number"
+                },
+                "SliMetric": {
+                    "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.SliMetric"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricThreshold",
+                "SliMetric"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationSignals::ServiceLevelObjective.SliMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyAttributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MetricDataQueries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective.MetricDataQuery"
+                    },
+                    "type": "array"
+                },
+                "MetricType": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "PeriodSeconds": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation": {
+            "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": {
+                        "CapacityAssignmentConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetDpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetDpus"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignment": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkgroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WorkgroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::CapacityReservation.CapacityAssignmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityAssignments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Athena::CapacityReservation.CapacityAssignment"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CapacityAssignments"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -19179,6 +20090,12 @@
                 "MetricName": {
                     "type": "string"
                 },
+                "Metrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery"
+                    },
+                    "type": "array"
+                },
                 "Namespace": {
                     "type": "string"
                 },
@@ -19189,11 +20106,6 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "MetricName",
-                "Namespace",
-                "Statistic"
-            ],
             "type": "object"
         },
         "AWS::AutoScaling::ScalingPolicy.Metric": {
@@ -19478,179 +20390,222 @@
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::ScheduledAction": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricDataQuery": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Id": {
                     "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "DesiredCapacity": {
-                            "type": "number"
-                        },
-                        "EndTime": {
-                            "type": "string"
-                        },
-                        "MaxSize": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "Recurrence": {
-                            "type": "string"
-                        },
-                        "StartTime": {
-                            "type": "string"
-                        },
-                        "TimeZone": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::ScheduledAction"
-                    ],
+                "Label": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat"
+                },
+                "ReturnData": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Id"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool": {
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingMetricStat": {
             "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": {
-                        "AutoScalingGroupName": {
-                            "type": "string"
-                        },
-                        "InstanceReusePolicy": {
-                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
-                        },
-                        "MaxGroupPreparedCapacity": {
-                            "type": "number"
-                        },
-                        "MinSize": {
-                            "type": "number"
-                        },
-                        "PoolState": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "AutoScalingGroupName"
-                    ],
-                    "type": "object"
+                "Metric": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.Metric"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::AutoScaling::WarmPool"
-                    ],
+                "Stat": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Unit": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Metric",
+                "Stat"
             ],
             "type": "object"
         },
-        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "ReuseOnScaleIn": {
-                    "type": "boolean"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::AutoScalingPlans::ScalingPlan": {
+        "AWS::AutoScaling::ScheduledAction": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "number"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Recurrence": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool": {
+            "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "InstanceReusePolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool.InstanceReusePolicy"
+                        },
+                        "MaxGroupPreparedCapacity": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "PoolState": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::WarmPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::WarmPool.InstanceReusePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ReuseOnScaleIn": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20048,6 +21003,9 @@
         "AWS::B2BI::Capability.EdiConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "CapabilityDirection": {
+                    "type": "string"
+                },
                 "InputLocation": {
                     "$ref": "#/definitions/AWS::B2BI::Capability.S3Location"
                 },
@@ -20146,6 +21104,9 @@
                             },
                             "type": "array"
                         },
+                        "CapabilityOptions": {
+                            "$ref": "#/definitions/AWS::B2BI::Partnership.CapabilityOptions"
+                        },
                         "Email": {
                             "type": "string"
                         },
@@ -20166,6 +21127,7 @@
                         }
                     },
                     "required": [
+                        "Capabilities",
                         "Email",
                         "Name",
                         "ProfileId"
@@ -20193,93 +21155,112 @@
             ],
             "type": "object"
         },
-        "AWS::B2BI::Profile": {
+        "AWS::B2BI::Partnership.CapabilityOptions": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "OutboundEdi": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.OutboundEdiOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.OutboundEdiOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "X12": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Envelope"
+                }
+            },
+            "required": [
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Delimiters": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentSeparator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "DataElementSeparator": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "SegmentTerminator": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12Envelope": {
+            "additionalProperties": false,
+            "properties": {
+                "Common": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12OutboundEdiHeaders"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12FunctionalGroupHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationReceiverCode": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "ApplicationSenderCode": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "BusinessName": {
-                            "type": "string"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "Logging": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Phone": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "BusinessName",
-                        "Logging",
-                        "Name",
-                        "Phone"
-                    ],
-                    "type": "object"
+                "ResponsibleAgencyCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Partnership.X12InterchangeControlHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "AcknowledgmentRequestedCode": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::B2BI::Profile"
-                    ],
+                "ReceiverId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "ReceiverIdQualifier": {
+                    "type": "string"
+                },
+                "RepetitionSeparator": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "SenderIdQualifier": {
+                    "type": "string"
+                },
+                "UsageIndicatorCode": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer": {
+        "AWS::B2BI::Partnership.X12OutboundEdiHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiters": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12Delimiters"
+                },
+                "FunctionalGroupHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12FunctionalGroupHeaders"
+                },
+                "InterchangeControlHeaders": {
+                    "$ref": "#/definitions/AWS::B2BI::Partnership.X12InterchangeControlHeaders"
+                },
+                "ValidateEdi": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Profile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -20314,21 +21295,107 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "EdiType": {
-                            "$ref": "#/definitions/AWS::B2BI::Transformer.EdiType"
+                        "BusinessName": {
+                            "type": "string"
                         },
-                        "FileFormat": {
+                        "Email": {
                             "type": "string"
                         },
-                        "MappingTemplate": {
+                        "Logging": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
-                        "SampleDocument": {
+                        "Phone": {
                             "type": "string"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BusinessName",
+                        "Logging",
+                        "Name",
+                        "Phone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::B2BI::Profile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer": {
+            "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": {
+                        "InputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.InputConversion"
+                        },
+                        "Mapping": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.Mapping"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputConversion": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.OutputConversion"
+                        },
+                        "SampleDocuments": {
+                            "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocuments"
+                        },
                         "Status": {
                             "type": "string"
                         },
@@ -20340,9 +21407,6 @@
                         }
                     },
                     "required": [
-                        "EdiType",
-                        "FileFormat",
-                        "MappingTemplate",
                         "Name",
                         "Status"
                     ],
@@ -20369,15 +21433,91 @@
             ],
             "type": "object"
         },
-        "AWS::B2BI::Transformer.EdiType": {
+        "AWS::B2BI::Transformer.FormatOptions": {
             "additionalProperties": false,
             "properties": {
-                "X12Details": {
+                "X12": {
                     "$ref": "#/definitions/AWS::B2BI::Transformer.X12Details"
                 }
             },
             "required": [
-                "X12Details"
+                "X12"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.InputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "FromFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FromFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.Mapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Template": {
+                    "type": "string"
+                },
+                "TemplateLanguage": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateLanguage"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.OutputConversion": {
+            "additionalProperties": false,
+            "properties": {
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::B2BI::Transformer.FormatOptions"
+                },
+                "ToFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ToFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocumentKeys": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Output": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::B2BI::Transformer.SampleDocuments": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Keys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::B2BI::Transformer.SampleDocumentKeys"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Keys"
             ],
             "type": "object"
         },
@@ -21408,6 +22548,9 @@
                         "ScheduleExpressionTimezone": {
                             "type": "string"
                         },
+                        "ScheduleStatus": {
+                            "type": "string"
+                        },
                         "StartWindowHours": {
                             "type": "number"
                         },
@@ -21736,6 +22879,9 @@
                         "ComputeResources": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
                         },
+                        "Context": {
+                            "type": "string"
+                        },
                         "EksConfiguration": {
                             "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.EksConfiguration"
                         },
@@ -22613,6 +23759,9 @@
                 "EcsProperties": {
                     "$ref": "#/definitions/AWS::Batch::JobDefinition.EcsProperties"
                 },
+                "EksProperties": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EksProperties"
+                },
                 "InstanceTypes": {
                     "items": {
                         "type": "string"
@@ -23207,6 +24356,9 @@
                         "FoundationModel": {
                             "type": "string"
                         },
+                        "GuardrailConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.GuardrailConfiguration"
+                        },
                         "IdleSessionTTLInSeconds": {
                             "type": "number"
                         },
@@ -23285,13 +24437,13 @@
         "AWS::Bedrock::Agent.ActionGroupExecutor": {
             "additionalProperties": false,
             "properties": {
+                "CustomControl": {
+                    "type": "string"
+                },
                 "Lambda": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Lambda"
-            ],
             "type": "object"
         },
         "AWS::Bedrock::Agent.AgentActionGroup": {
@@ -23312,6 +24464,9 @@
                 "Description": {
                     "type": "string"
                 },
+                "FunctionSchema": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.FunctionSchema"
+                },
                 "ParentActionGroupSignature": {
                     "type": "string"
                 },
@@ -23343,367 +24498,154 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.InferenceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumLength": {
-                    "type": "number"
-                },
-                "StopSequences": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Temperature": {
-                    "type": "number"
-                },
-                "TopK": {
-                    "type": "number"
-                },
-                "TopP": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Agent.PromptConfiguration": {
+        "AWS::Bedrock::Agent.Function": {
             "additionalProperties": false,
             "properties": {
-                "BasePromptTemplate": {
-                    "type": "string"
-                },
-                "InferenceConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
-                },
-                "ParserMode": {
-                    "type": "string"
-                },
-                "PromptCreationMode": {
+                "Description": {
                     "type": "string"
                 },
-                "PromptState": {
+                "Name": {
                     "type": "string"
                 },
-                "PromptType": {
-                    "type": "string"
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Bedrock::Agent.ParameterDetail"
+                        }
+                    },
+                    "type": "object"
                 }
             },
+            "required": [
+                "Name"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
+        "AWS::Bedrock::Agent.FunctionSchema": {
             "additionalProperties": false,
             "properties": {
-                "OverrideLambda": {
-                    "type": "string"
-                },
-                "PromptConfigurations": {
+                "Functions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.Function"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PromptConfigurations"
+                "Functions"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Agent.S3Identifier": {
+        "AWS::Bedrock::Agent.GuardrailConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "S3BucketName": {
+                "GuardrailIdentifier": {
                     "type": "string"
                 },
-                "S3ObjectKey": {
+                "GuardrailVersion": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias": {
+        "AWS::Bedrock::Agent.InferenceConfiguration": {
             "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"
+                "MaximumLength": {
+                    "type": "number"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "AgentAliasName": {
-                            "type": "string"
-                        },
-                        "AgentId": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "RoutingConfiguration": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "AgentAliasName",
-                        "AgentId"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::AgentAlias"
-                    ],
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+        "AWS::Bedrock::Agent.ParameterDetail": {
             "additionalProperties": false,
             "properties": {
-                "EndDate": {
+                "Description": {
                     "type": "string"
                 },
-                "RoutingConfiguration": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
-                    },
-                    "type": "array"
+                "Required": {
+                    "type": "boolean"
                 },
-                "StartDate": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
-            "additionalProperties": false,
-            "properties": {
-                "AgentVersion": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "AgentVersion"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource": {
+        "AWS::Bedrock::Agent.PromptConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "BasePromptTemplate": {
                     "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": {
-                        "DataSourceConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "KnowledgeBaseId": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ServerSideEncryptionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
-                        },
-                        "VectorIngestionConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
-                        }
-                    },
-                    "required": [
-                        "DataSourceConfiguration",
-                        "KnowledgeBaseId",
-                        "Name"
-                    ],
-                    "type": "object"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Agent.InferenceConfiguration"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Bedrock::DataSource"
-                    ],
+                "ParserMode": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingStrategy": {
+                "PromptCreationMode": {
                     "type": "string"
                 },
-                "FixedSizeChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
-                }
-            },
-            "required": [
-                "ChunkingStrategy"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3Configuration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
-                },
-                "Type": {
+                "PromptState": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "S3Configuration",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxTokens": {
-                    "type": "number"
                 },
-                "OverlapPercentage": {
-                    "type": "number"
+                "PromptType": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "MaxTokens",
-                "OverlapPercentage"
-            ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+        "AWS::Bedrock::Agent.PromptOverrideConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BucketArn": {
+                "OverrideLambda": {
                     "type": "string"
                 },
-                "InclusionPrefixes": {
+                "PromptConfigurations": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Agent.PromptConfiguration"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "BucketArn"
+                "PromptConfigurations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+        "AWS::Bedrock::Agent.S3Identifier": {
             "additionalProperties": false,
             "properties": {
-                "KmsKeyArn": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectKey": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "ChunkingConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Bedrock::Guardrail": {
+        "AWS::Bedrock::AgentAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -23738,50 +24680,155 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "BlockedInputMessaging": {
+                        "AgentAliasName": {
                             "type": "string"
                         },
-                        "BlockedOutputsMessaging": {
+                        "AgentId": {
                             "type": "string"
                         },
-                        "ContentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
-                            "type": "string"
+                        "RoutingConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                            },
+                            "type": "array"
                         },
-                        "Name": {
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AgentAliasName",
+                        "AgentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Bedrock::AgentAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasHistoryEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EndDate": {
+                    "type": "string"
+                },
+                "RoutingConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem"
+                    },
+                    "type": "array"
+                },
+                "StartDate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::AgentAlias.AgentAliasRoutingConfigurationListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "SensitiveInformationPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
-                        },
-                        "Tags": {
+                        {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
                             },
                             "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDeletionPolicy": {
+                            "type": "string"
                         },
-                        "TopicPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.DataSourceConfiguration"
                         },
-                        "WordPolicyConfig": {
-                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KnowledgeBaseId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration"
+                        },
+                        "VectorIngestionConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::DataSource.VectorIngestionConfiguration"
                         }
                     },
                     "required": [
-                        "BlockedInputMessaging",
-                        "BlockedOutputsMessaging",
+                        "DataSourceConfiguration",
+                        "KnowledgeBaseId",
                         "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::Guardrail"
+                        "AWS::Bedrock::DataSource"
                     ],
                     "type": "string"
                 },
@@ -23800,46 +24847,144 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
+        "AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "InputStrength": {
+                "ModelArn": {
                     "type": "string"
                 },
-                "OutputStrength": {
+                "ParsingPrompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingPrompt"
+                }
+            },
+            "required": [
+                "ModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingStrategy": {
+                    "type": "string"
+                },
+                "FixedSizeChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration"
+                },
+                "HierarchicalChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration"
+                },
+                "SemanticChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SemanticChunkingConfiguration"
+                }
+            },
+            "required": [
+                "ChunkingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ConfluenceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
                     "type": "string"
                 },
+                "HostType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostType",
+                "HostUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.CrawlFilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PatternObjectFilter": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilterConfiguration"
+                },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InputStrength",
-                "OutputStrength",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
+        "AWS::Bedrock::DataSource.CustomTransformationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FiltersConfig": {
+                "IntermediateStorage": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.IntermediateStorage"
+                },
+                "Transformations": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.Transformation"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "FiltersConfig"
+                "IntermediateStorage",
+                "Transformations"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
+        "AWS::Bedrock::DataSource.DataSourceConfiguration": {
             "additionalProperties": false,
             "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ConfluenceDataSourceConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointDataSourceConfiguration"
+                },
                 "Type": {
                     "type": "string"
+                },
+                "WebConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebDataSourceConfiguration"
                 }
             },
             "required": [
@@ -23847,135 +24992,438 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
+        "AWS::Bedrock::DataSource.FixedSizeChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "Type": {
-                    "type": "string"
+                "OverlapPercentage": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Action",
-                "Type"
+                "MaxTokens",
+                "OverlapPercentage"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.RegexConfig": {
+        "AWS::Bedrock::DataSource.HierarchicalChunkingConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Action": {
-                    "type": "string"
+                "LevelConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration"
+                    },
+                    "type": "array"
                 },
-                "Description": {
-                    "type": "string"
+                "OverlapTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LevelConfigurations",
+                "OverlapTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.HierarchicalChunkingLevelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.IntermediateStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.S3Location"
+                }
+            },
+            "required": [
+                "S3Location"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockFoundationModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.BedrockFoundationModelConfiguration"
                 },
-                "Name": {
+                "ParsingStrategy": {
                     "type": "string"
-                },
-                "Pattern": {
+                }
+            },
+            "required": [
+                "ParsingStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ParsingPrompt": {
+            "additionalProperties": false,
+            "properties": {
+                "ParsingPromptText": {
                     "type": "string"
                 }
             },
             "required": [
-                "Action",
-                "Name",
-                "Pattern"
+                "ParsingPromptText"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilter": {
             "additionalProperties": false,
             "properties": {
-                "PiiEntitiesConfig": {
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "RegexesConfig": {
+                "InclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "ObjectType": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ObjectType"
+            ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicConfig": {
+        "AWS::Bedrock::DataSource.PatternObjectFilterConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Definition": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.PatternObjectFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Filters"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
                     "type": "string"
                 },
-                "Examples": {
+                "BucketOwnerAccountId": {
+                    "type": "string"
+                },
+                "InclusionPrefixes": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "BucketArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "URI"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceCrawlerConfiguration"
                 },
-                "Name": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SalesforceSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SalesforceSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
                     "type": "string"
                 },
-                "Type": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "HostUrl": {
                     "type": "string"
                 }
             },
             "required": [
-                "Definition",
-                "Name",
-                "Type"
+                "AuthType",
+                "CredentialsSecretArn",
+                "HostUrl"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
+        "AWS::Bedrock::DataSource.SeedUrl": {
             "additionalProperties": false,
             "properties": {
-                "TopicsConfig": {
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SemanticChunkingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BreakpointPercentileThreshold": {
+                    "type": "number"
+                },
+                "BufferSize": {
+                    "type": "number"
+                },
+                "MaxTokens": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BreakpointPercentileThreshold",
+                "BufferSize",
+                "MaxTokens"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CrawlFilterConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.SharePointSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.SharePointSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthType": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                },
+                "HostType": {
+                    "type": "string"
+                },
+                "SiteUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "TenantId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TopicsConfig"
+                "AuthType",
+                "CredentialsSecretArn",
+                "Domain",
+                "HostType",
+                "SiteUrls"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordConfig": {
+        "AWS::Bedrock::DataSource.Transformation": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
+                "StepToApply": {
                     "type": "string"
+                },
+                "TransformationFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationFunction"
                 }
             },
             "required": [
-                "Text"
+                "StepToApply",
+                "TransformationFunction"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+        "AWS::Bedrock::DataSource.TransformationFunction": {
             "additionalProperties": false,
             "properties": {
-                "ManagedWordListsConfig": {
+                "TransformationLambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.TransformationLambdaConfiguration"
+                }
+            },
+            "required": [
+                "TransformationLambdaConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.TransformationLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.UrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                        "$ref": "#/definitions/AWS::Bedrock::DataSource.SeedUrl"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.VectorIngestionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChunkingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ChunkingConfiguration"
                 },
-                "WordsConfig": {
+                "CustomTransformationConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.CustomTransformationConfiguration"
+                },
+                "ParsingConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.ParsingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerLimits": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerLimits"
+                },
+                "ExclusionFilters": {
                     "items": {
-                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionFilters": {
+                    "items": {
+                        "type": "string"
                     },
                     "type": "array"
+                },
+                "Scope": {
+                    "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase": {
+        "AWS::Bedrock::DataSource.WebCrawlerLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebDataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebCrawlerConfiguration"
+                },
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.WebSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::DataSource.WebSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "UrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::DataSource.UrlConfiguration"
+                }
+            },
+            "required": [
+                "UrlConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24010,20 +25458,35 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "KnowledgeBaseConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDefinition"
                         },
-                        "Name": {
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow.S3Location"
+                        },
+                        "DefinitionString": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "StorageConfiguration": {
-                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
                         },
                         "Tags": {
                             "additionalProperties": true,
@@ -24033,19 +25496,26 @@
                                 }
                             },
                             "type": "object"
+                        },
+                        "TestAliasTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "KnowledgeBaseConfiguration",
-                        "Name",
-                        "RoleArn",
-                        "StorageConfiguration"
+                        "ExecutionRoleArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Bedrock::KnowledgeBase"
+                        "AWS::Bedrock::Flow"
                     ],
                     "type": "string"
                 },
@@ -24064,187 +25534,517 @@
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "AgentAliasArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.ConditionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
                     "type": "string"
                 },
-                "VectorKnowledgeBaseConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                "Name": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "VectorKnowledgeBaseConfiguration"
+                "Name"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+        "AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "CollectionArn": {
+                "Condition": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnectionConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                "Name": {
+                    "type": "string"
                 },
-                "VectorIndexName": {
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "CollectionArn",
-                "FieldMapping",
-                "VectorIndexName"
+                "Name",
+                "Source",
+                "Target",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+        "AWS::Bedrock::Flow.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
-                    "type": "string"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConditionalConnectionConfiguration"
                 },
-                "TextField": {
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
                     "type": "string"
                 },
-                "VectorField": {
+                "TargetInput": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField",
-                "VectorField"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+        "AWS::Bedrock::Flow.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ConnectionString": {
+                "Connections": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowConnection"
+                    },
+                    "type": "array"
+                },
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNode"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeConfiguration"
+                },
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "CredentialsSecretArn": {
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.FlowNodeOutput"
+                    },
+                    "type": "array"
+                },
+                "Type": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.AgentFlowNodeConfiguration"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                "Collector": {
+                    "type": "object"
                 },
-                "Namespace": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.ConditionFlowNodeConfiguration"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Iterator": {
+                    "type": "object"
+                },
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration"
+                },
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.FlowNodeInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "ConnectionString",
-                "CredentialsSecretArn",
-                "FieldMapping"
+                "Expression",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+        "AWS::Bedrock::Flow.FlowNodeOutput": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "Name": {
                     "type": "string"
                 },
-                "TextField": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "TextField"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+        "AWS::Bedrock::Flow.FlowValidation": {
             "additionalProperties": false,
             "properties": {
-                "CredentialsSecretArn": {
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.KnowledgeBaseFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
                     "type": "string"
                 },
-                "DatabaseName": {
+                "ModelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LambdaFunctionFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.LexFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "FieldMapping": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                "LocaleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BotAliasArn",
+                "LocaleId"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration"
+                }
+            },
+            "required": [
+                "SourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInferenceConfiguration"
                 },
-                "ResourceArn": {
+                "ModelId": {
                     "type": "string"
                 },
-                "TableName": {
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "CredentialsSecretArn",
-                "DatabaseName",
-                "FieldMapping",
-                "ResourceArn",
-                "TableName"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+        "AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "MetadataField": {
+                "PromptArn": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeInlineConfiguration"
                 },
-                "PrimaryKeyField": {
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptFlowNodeResourceConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "TextField": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "VectorField": {
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "MetadataField",
-                "PrimaryKeyField",
-                "TextField",
-                "VectorField"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+        "AWS::Bedrock::Flow.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "OpensearchServerlessConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
-                },
-                "PineconeConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
                 },
-                "RdsConfiguration": {
-                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "Type": {
+                "Version": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+        "AWS::Bedrock::Flow.StorageFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "EmbeddingModelArn": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration"
+                }
+            },
+            "required": [
+                "ServiceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.StorageFlowNodeS3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "EmbeddingModelArn"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup": {
+        "AWS::Bedrock::Flow.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::Flow.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::Flow.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Flow.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowAlias": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24279,39 +26079,41 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountGrouping": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
-                        },
-                        "ComputationPreference": {
-                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
                         },
-                        "PrimaryAccountId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "RoutingConfiguration": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem"
                             },
                             "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "AccountGrouping",
-                        "ComputationPreference",
+                        "FlowArn",
                         "Name",
-                        "PrimaryAccountId"
+                        "RoutingConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::BillingGroup"
+                        "AWS::Bedrock::FlowAlias"
                     ],
                     "type": "string"
                 },
@@ -24330,37 +26132,16 @@
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoAssociate": {
-                    "type": "boolean"
-                },
-                "LinkedAccountIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "LinkedAccountIds"
-            ],
-            "type": "object"
-        },
-        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+        "AWS::Bedrock::FlowAlias.FlowAliasRoutingConfigurationListItem": {
             "additionalProperties": false,
             "properties": {
-                "PricingPlanArn": {
+                "FlowVersion": {
                     "type": "string"
                 }
             },
-            "required": [
-                "PricingPlanArn"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem": {
+        "AWS::Bedrock::FlowVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -24395,40 +26176,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AccountId": {
-                            "type": "string"
-                        },
-                        "BillingGroupArn": {
-                            "type": "string"
-                        },
-                        "BillingPeriodRange": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
-                        },
-                        "CustomLineItemChargeDetails": {
-                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "Name": {
+                        "FlowArn": {
                             "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
                         }
                     },
                     "required": [
-                        "BillingGroupArn",
-                        "Name"
+                        "FlowArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::BillingConductor::CustomLineItem"
+                        "AWS::Bedrock::FlowVersion"
                     ],
                     "type": "string"
                 },
@@ -24447,557 +26209,486 @@
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+        "AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ExclusiveEndBillingPeriod": {
-                    "type": "string"
-                },
-                "InclusiveStartBillingPeriod": {
+                "AgentAliasArn": {
                     "type": "string"
                 }
             },
-            "type": "object"
+            "required": [
+                "AgentAliasArn"
+            ],
+            "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+        "AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Flat": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
-                },
-                "LineItemFilters": {
+                "Conditions": {
                     "items": {
-                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowCondition"
                     },
                     "type": "array"
+                }
+            },
+            "required": [
+                "Conditions"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
                 },
-                "Percentage": {
-                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnectionConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
                 },
                 "Type": {
                     "type": "string"
                 }
             },
             "required": [
+                "Name",
+                "Source",
+                "Target",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowConnectionConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ChargeValue": {
-                    "type": "number"
+                "Conditional": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConditionalConnectionConfiguration"
+                },
+                "Data": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowDataConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceOutput": {
+                    "type": "string"
+                },
+                "TargetInput": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ChargeValue"
+                "SourceOutput",
+                "TargetInput"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+        "AWS::Bedrock::FlowVersion.FlowDefinition": {
             "additionalProperties": false,
             "properties": {
-                "ChildAssociatedResources": {
+                "Connections": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowConnection"
                     },
                     "type": "array"
                 },
-                "PercentageValue": {
-                    "type": "number"
+                "Nodes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNode"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "PercentageValue"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+        "AWS::Bedrock::FlowVersion.FlowNode": {
             "additionalProperties": false,
             "properties": {
-                "Attribute": {
-                    "type": "string"
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeConfiguration"
                 },
-                "MatchOption": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeInput"
+                    },
+                    "type": "array"
+                },
+                "Name": {
                     "type": "string"
                 },
-                "Values": {
+                "Outputs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.FlowNodeOutput"
                     },
                     "type": "array"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Attribute",
-                "MatchOption",
-                "Values"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingPlan": {
+        "AWS::Bedrock::FlowVersion.FlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
+                "Agent": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.AgentFlowNodeConfiguration"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "Collector": {
+                    "type": "object"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "Condition": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.ConditionFlowNodeConfiguration"
                 },
-                "Metadata": {
+                "Input": {
                     "type": "object"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "PricingRuleArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name"
-                    ],
+                "Iterator": {
                     "type": "object"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingPlan"
-                    ],
-                    "type": "string"
+                "KnowledgeBase": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "LambdaFunction": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration"
+                },
+                "Lex": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration"
+                },
+                "Output": {
+                    "type": "object"
+                },
+                "Prompt": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration"
+                },
+                "Retrieval": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration"
+                },
+                "Storage": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule": {
+        "AWS::Bedrock::FlowVersion.FlowNodeInput": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Expression": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Name": {
                     "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": {
-                        "BillingEntity": {
-                            "type": "string"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "ModifierPercentage": {
-                            "type": "number"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Operation": {
-                            "type": "string"
-                        },
-                        "Scope": {
-                            "type": "string"
-                        },
-                        "Service": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "Tiering": {
-                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "UsageType": {
-                            "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "Scope",
-                        "Type"
-                    ],
-                    "type": "object"
-                },
                 "Type": {
-                    "enum": [
-                        "AWS::BillingConductor::PricingRule"
-                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.FlowNodeOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.FreeTier": {
+        "AWS::Bedrock::FlowVersion.KnowledgeBaseFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Activated": {
-                    "type": "boolean"
+                "KnowledgeBaseId": {
+                    "type": "string"
+                },
+                "ModelId": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Activated"
+                "KnowledgeBaseId"
             ],
             "type": "object"
         },
-        "AWS::BillingConductor::PricingRule.Tiering": {
+        "AWS::Bedrock::FlowVersion.LambdaFunctionFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "FreeTier": {
-                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
+                "LambdaArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "LambdaArn"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::Budget": {
+        "AWS::Bedrock::FlowVersion.LexFlowNodeConfiguration": {
             "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": {
-                        "Budget": {
-                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
-                        },
-                        "NotificationsWithSubscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Budget"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Budgets::Budget"
-                    ],
+                "BotAliasArn": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "LocaleId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "BotAliasArn",
+                "LocaleId"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.AutoAdjustData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustType": {
-                    "type": "string"
-                },
-                "HistoricalOptions": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
+                "SourceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration"
                 }
             },
             "required": [
-                "AutoAdjustType"
+                "SourceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.BudgetData": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "AutoAdjustData": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
-                },
-                "BudgetLimit": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
-                },
-                "BudgetName": {
-                    "type": "string"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInferenceConfiguration"
                 },
-                "BudgetType": {
+                "ModelId": {
                     "type": "string"
                 },
-                "CostFilters": {
-                    "type": "object"
-                },
-                "CostTypes": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
-                },
-                "PlannedBudgetLimits": {
-                    "type": "object"
-                },
-                "TimePeriod": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptTemplateConfiguration"
                 },
-                "TimeUnit": {
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "BudgetType",
-                "TimeUnit"
+                "ModelId",
+                "TemplateConfiguration",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.CostTypes": {
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "IncludeCredit": {
-                    "type": "boolean"
-                },
-                "IncludeDiscount": {
-                    "type": "boolean"
-                },
-                "IncludeOtherSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeRecurring": {
-                    "type": "boolean"
-                },
-                "IncludeRefund": {
-                    "type": "boolean"
-                },
-                "IncludeSubscription": {
-                    "type": "boolean"
-                },
-                "IncludeSupport": {
-                    "type": "boolean"
-                },
-                "IncludeTax": {
-                    "type": "boolean"
-                },
-                "IncludeUpfront": {
-                    "type": "boolean"
-                },
-                "UseAmortized": {
-                    "type": "boolean"
+                "PromptArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PromptArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptFlowNodeSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inline": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeInlineConfiguration"
                 },
-                "UseBlended": {
-                    "type": "boolean"
+                "Resource": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptFlowNodeResourceConfiguration"
                 }
             },
             "type": "object"
         },
-        "AWS::Budgets::Budget.HistoricalOptions": {
+        "AWS::Bedrock::FlowVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "BudgetAdjustmentPeriod": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "BudgetAdjustmentPeriod"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Notification": {
+        "AWS::Bedrock::FlowVersion.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "ComparisonOperator": {
+                "Name": {
                     "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "NotificationType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Threshold": {
+                "Temperature": {
                     "type": "number"
                 },
-                "ThresholdType": {
-                    "type": "string"
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ComparisonOperator",
-                "NotificationType",
-                "Threshold"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Notification": {
-                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
-                },
-                "Subscribers": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
-                    },
-                    "type": "array"
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Notification",
-                "Subscribers"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Spend": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "Amount": {
-                    "type": "number"
-                },
-                "Unit": {
+                "BucketName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Amount",
-                "Unit"
+                "BucketName"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.Subscriber": {
+        "AWS::Bedrock::FlowVersion.RetrievalFlowNodeServiceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "SubscriptionType": {
-                    "type": "string"
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.RetrievalFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration"
                 }
             },
             "required": [
-                "Address",
-                "SubscriptionType"
+                "ServiceConfiguration"
             ],
             "type": "object"
         },
-        "AWS::Budgets::Budget.TimePeriod": {
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration": {
             "additionalProperties": false,
             "properties": {
-                "End": {
+                "BucketName": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.StorageFlowNodeServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::Bedrock::FlowVersion.StorageFlowNodeS3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::FlowVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::FlowVersion.PromptInputVariable"
+                    },
+                    "type": "array"
                 },
-                "Start": {
+                "Text": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Text"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction": {
+        "AWS::Bedrock::Guardrail": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25032,48 +26723,53 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ActionThreshold": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
-                        },
-                        "ActionType": {
+                        "BlockedInputMessaging": {
                             "type": "string"
                         },
-                        "ApprovalModel": {
+                        "BlockedOutputsMessaging": {
                             "type": "string"
                         },
-                        "BudgetName": {
-                            "type": "string"
+                        "ContentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentPolicyConfig"
                         },
-                        "Definition": {
-                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        "ContextualGroundingPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig"
                         },
-                        "ExecutionRoleArn": {
+                        "Description": {
                             "type": "string"
                         },
-                        "NotificationType": {
+                        "KmsKeyArn": {
                             "type": "string"
                         },
-                        "Subscribers": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SensitiveInformationPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig"
+                        },
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TopicPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicPolicyConfig"
+                        },
+                        "WordPolicyConfig": {
+                            "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordPolicyConfig"
                         }
                     },
                     "required": [
-                        "ActionThreshold",
-                        "ActionType",
-                        "BudgetName",
-                        "Definition",
-                        "ExecutionRoleArn",
-                        "NotificationType",
-                        "Subscribers"
+                        "BlockedInputMessaging",
+                        "BlockedOutputsMessaging",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Budgets::BudgetsAction"
+                        "AWS::Bedrock::Guardrail"
                     ],
                     "type": "string"
                 },
@@ -25092,113 +26788,88 @@
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+        "AWS::Bedrock::Guardrail.ContentFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Type": {
+                "InputStrength": {
                     "type": "string"
                 },
-                "Value": {
-                    "type": "number"
+                "OutputStrength": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Value"
+                "InputStrength",
+                "OutputStrength",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Definition": {
+        "AWS::Bedrock::Guardrail.ContentPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "IamActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
-                },
-                "ScpActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
-                },
-                "SsmActionDefinition": {
-                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                "FiltersConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContentFilterConfig"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "FiltersConfig"
+            ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig": {
             "additionalProperties": false,
             "properties": {
-                "Groups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Threshold": {
+                    "type": "number"
                 },
-                "PolicyArn": {
+                "Type": {
                     "type": "string"
-                },
-                "Roles": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Users": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
                 }
             },
             "required": [
-                "PolicyArn"
+                "Threshold",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+        "AWS::Bedrock::Guardrail.ContextualGroundingPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "PolicyId": {
-                    "type": "string"
-                },
-                "TargetIds": {
+                "FiltersConfig": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ContextualGroundingFilterConfig"
                     },
                     "type": "array"
                 }
             },
             "required": [
-                "PolicyId",
-                "TargetIds"
+                "FiltersConfig"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+        "AWS::Bedrock::Guardrail.ManagedWordsConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "Subtype": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "InstanceIds",
-                "Region",
-                "Subtype"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::Budgets::BudgetsAction.Subscriber": {
+        "AWS::Bedrock::Guardrail.PiiEntityConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
+                "Action": {
                     "type": "string"
                 },
                 "Type": {
@@ -25206,239 +26877,124 @@
                 }
             },
             "required": [
-                "Address",
+                "Action",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor": {
+        "AWS::Bedrock::Guardrail.RegexConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Action": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Description": {
                     "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": {
-                        "MonitorDimension": {
-                            "type": "string"
-                        },
-                        "MonitorName": {
-                            "type": "string"
-                        },
-                        "MonitorSpecification": {
-                            "type": "string"
-                        },
-                        "MonitorType": {
-                            "type": "string"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "MonitorName",
-                        "MonitorType"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalyMonitor"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Pattern": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Action",
+                "Name",
+                "Pattern"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalyMonitor.ResourceTag": {
+        "AWS::Bedrock::Guardrail.SensitiveInformationPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
+                "PiiEntitiesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.PiiEntityConfig"
+                    },
+                    "type": "array"
                 },
-                "Value": {
-                    "type": "string"
+                "RegexesConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.RegexConfig"
+                    },
+                    "type": "array"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription": {
+        "AWS::Bedrock::Guardrail.TopicConfig": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Definition": {
                     "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": {
-                        "Frequency": {
-                            "type": "string"
-                        },
-                        "MonitorArnList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "ResourceTags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
-                            },
-                            "type": "array"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
-                            },
-                            "type": "array"
-                        },
-                        "SubscriptionName": {
-                            "type": "string"
-                        },
-                        "Threshold": {
-                            "type": "number"
-                        },
-                        "ThresholdExpression": {
-                            "type": "string"
-                        }
+                "Examples": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Frequency",
-                        "MonitorArnList",
-                        "Subscribers",
-                        "SubscriptionName"
-                    ],
-                    "type": "object"
+                    "type": "array"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::CE::AnomalySubscription"
-                    ],
+                "Name": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Definition",
+                "Name",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.ResourceTag": {
+        "AWS::Bedrock::Guardrail.TopicPolicyConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "TopicsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.TopicConfig"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Key",
-                "Value"
+                "TopicsConfig"
             ],
             "type": "object"
         },
-        "AWS::CE::AnomalySubscription.Subscriber": {
+        "AWS::Bedrock::Guardrail.WordConfig": {
             "additionalProperties": false,
             "properties": {
-                "Address": {
-                    "type": "string"
-                },
-                "Status": {
-                    "type": "string"
-                },
-                "Type": {
+                "Text": {
                     "type": "string"
                 }
             },
             "required": [
-                "Address",
-                "Type"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::CE::CostCategory": {
+        "AWS::Bedrock::Guardrail.WordPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ManagedWordListsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.ManagedWordsConfig"
+                    },
+                    "type": "array"
+                },
+                "WordsConfig": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Guardrail.WordConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::GuardrailVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25473,32 +27029,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultValue": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RuleVersion": {
-                            "type": "string"
-                        },
-                        "Rules": {
+                        "Description": {
                             "type": "string"
                         },
-                        "SplitChargeRules": {
+                        "GuardrailIdentifier": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RuleVersion",
-                        "Rules"
+                        "GuardrailIdentifier"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CE::CostCategory"
+                        "AWS::Bedrock::GuardrailVersion"
                     ],
                     "type": "string"
                 },
@@ -25517,7 +27062,7 @@
             ],
             "type": "object"
         },
-        "AWS::CUR::ReportDefinition": {
+        "AWS::Bedrock::KnowledgeBase": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25552,65 +27097,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdditionalArtifacts": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "AdditionalSchemaElements": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BillingViewArn": {
-                            "type": "string"
-                        },
-                        "Compression": {
-                            "type": "string"
-                        },
-                        "Format": {
-                            "type": "string"
-                        },
-                        "RefreshClosedReports": {
-                            "type": "boolean"
-                        },
-                        "ReportName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "ReportVersioning": {
-                            "type": "string"
+                        "KnowledgeBaseConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration"
                         },
-                        "S3Bucket": {
+                        "Name": {
                             "type": "string"
                         },
-                        "S3Prefix": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "S3Region": {
-                            "type": "string"
+                        "StorageConfiguration": {
+                            "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.StorageConfiguration"
                         },
-                        "TimeUnit": {
-                            "type": "string"
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "Compression",
-                        "Format",
-                        "RefreshClosedReports",
-                        "ReportName",
-                        "ReportVersioning",
-                        "S3Bucket",
-                        "S3Prefix",
-                        "S3Region",
-                        "TimeUnit"
+                        "KnowledgeBaseConfiguration",
+                        "Name",
+                        "RoleArn",
+                        "StorageConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CUR::ReportDefinition"
+                        "AWS::Bedrock::KnowledgeBase"
                     ],
                     "type": "string"
                 },
@@ -25629,92 +27151,266 @@
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace": {
+        "AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Dimensions": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BedrockEmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.BedrockEmbeddingModelConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.KnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "VectorKnowledgeBaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration"
+                }
+            },
+            "required": [
+                "Type",
+                "VectorKnowledgeBaseConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionName": {
                     "type": "string"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "CredentialsSecretArn": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "KeyspaceName": {
-                            "type": "string"
-                        },
-                        "ReplicationSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "type": "object"
+                "Endpoint": {
+                    "type": "string"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::Cassandra::Keyspace"
-                    ],
+                "EndpointServiceName": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping"
+                },
+                "VectorIndexName": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "CollectionName",
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "Endpoint",
+                "FieldMapping",
+                "VectorIndexName"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
+        "AWS::Bedrock::KnowledgeBase.MongoDbAtlasFieldMapping": {
             "additionalProperties": false,
             "properties": {
-                "RegionList": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "MetadataField": {
+                    "type": "string"
                 },
-                "ReplicationStrategy": {
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
                     "type": "string"
                 }
             },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table": {
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping"
+                },
+                "VectorIndexName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionArn",
+                "FieldMapping",
+                "VectorIndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.OpenSearchServerlessFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionString": {
+                    "type": "string"
+                },
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeFieldMapping"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectionString",
+                "CredentialsSecretArn",
+                "FieldMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.PineconeFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "TextField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsSecretArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "FieldMapping": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsFieldMapping"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CredentialsSecretArn",
+                "DatabaseName",
+                "FieldMapping",
+                "ResourceArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.RdsFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MetadataField": {
+                    "type": "string"
+                },
+                "PrimaryKeyField": {
+                    "type": "string"
+                },
+                "TextField": {
+                    "type": "string"
+                },
+                "VectorField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetadataField",
+                "PrimaryKeyField",
+                "TextField",
+                "VectorField"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MongoDbAtlasConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.MongoDbAtlasConfiguration"
+                },
+                "OpensearchServerlessConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.OpenSearchServerlessConfiguration"
+                },
+                "PineconeConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.PineconeConfiguration"
+                },
+                "RdsConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.RdsConfiguration"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::KnowledgeBase.VectorKnowledgeBaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EmbeddingModelArn": {
+                    "type": "string"
+                },
+                "EmbeddingModelConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase.EmbeddingModelConfiguration"
+                }
+            },
+            "required": [
+                "EmbeddingModelArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::Prompt": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -25749,70 +27445,42 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoScalingSpecifications": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
-                        },
-                        "BillingMode": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
-                        },
-                        "ClientSideTimestampsEnabled": {
-                            "type": "boolean"
-                        },
-                        "ClusteringKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
-                            },
-                            "type": "array"
-                        },
-                        "DefaultTimeToLive": {
-                            "type": "number"
-                        },
-                        "EncryptionSpecification": {
-                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
-                        },
-                        "KeyspaceName": {
+                        "CustomerEncryptionKeyArn": {
                             "type": "string"
                         },
-                        "PartitionKeyColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
-                        },
-                        "PointInTimeRecoveryEnabled": {
-                            "type": "boolean"
-                        },
-                        "RegularColumns": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                            },
-                            "type": "array"
+                        "DefaultVariant": {
+                            "type": "string"
                         },
-                        "ReplicaSpecifications": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
-                            },
-                            "type": "array"
+                        "Description": {
+                            "type": "string"
                         },
-                        "TableName": {
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptVariant"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "KeyspaceName",
-                        "PartitionKeyColumns"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cassandra::Table"
+                        "AWS::Bedrock::Prompt"
                     ],
                     "type": "string"
                 },
@@ -25831,162 +27499,126 @@
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.AutoScalingSetting": {
-            "additionalProperties": false,
-            "properties": {
-                "AutoScalingDisabled": {
-                    "type": "boolean"
-                },
-                "MaximumUnits": {
-                    "type": "number"
-                },
-                "MinimumUnits": {
-                    "type": "number"
-                },
-                "ScalingPolicy": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.AutoScalingSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                },
-                "WriteCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.BillingMode": {
+        "AWS::Bedrock::Prompt.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Mode": {
-                    "type": "string"
-                },
-                "ProvisionedThroughput": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptModelInferenceConfiguration"
                 }
             },
             "required": [
-                "Mode"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+        "AWS::Bedrock::Prompt.PromptInputVariable": {
             "additionalProperties": false,
             "properties": {
-                "Column": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
-                },
-                "OrderBy": {
+                "Name": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Column"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.Column": {
+        "AWS::Bedrock::Prompt.PromptModelInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
-                    "type": "string"
+                "MaxTokens": {
+                    "type": "number"
                 },
-                "ColumnType": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnType"
-            ],
-            "type": "object"
-        },
-        "AWS::Cassandra::Table.EncryptionSpecification": {
-            "additionalProperties": false,
-            "properties": {
-                "EncryptionType": {
-                    "type": "string"
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "KmsKeyIdentifier": {
-                    "type": "string"
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
+                    "type": "number"
                 }
             },
-            "required": [
-                "EncryptionType"
-            ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ProvisionedThroughput": {
+        "AWS::Bedrock::Prompt.PromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityUnits": {
-                    "type": "number"
-                },
-                "WriteCapacityUnits": {
-                    "type": "number"
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextPromptTemplateConfiguration"
                 }
             },
             "required": [
-                "ReadCapacityUnits",
-                "WriteCapacityUnits"
+                "Text"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ReplicaSpecification": {
+        "AWS::Bedrock::Prompt.PromptVariant": {
             "additionalProperties": false,
             "properties": {
-                "ReadCapacityAutoScaling": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInferenceConfiguration"
                 },
-                "ReadCapacityUnits": {
-                    "type": "number"
+                "ModelId": {
+                    "type": "string"
                 },
-                "Region": {
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
                     "type": "string"
                 }
             },
             "required": [
-                "Region"
+                "Name",
+                "TemplateType"
             ],
             "type": "object"
         },
-        "AWS::Cassandra::Table.ScalingPolicy": {
+        "AWS::Bedrock::Prompt.TextPromptTemplateConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "TargetTrackingScalingPolicyConfiguration": {
-                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::Prompt.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextS3Location": {
+                    "$ref": "#/definitions/AWS::Bedrock::Prompt.TextS3Location"
                 }
             },
             "type": "object"
         },
-        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+        "AWS::Bedrock::Prompt.TextS3Location": {
             "additionalProperties": false,
             "properties": {
-                "DisableScaleIn": {
-                    "type": "boolean"
-                },
-                "ScaleInCooldown": {
-                    "type": "number"
+                "Bucket": {
+                    "type": "string"
                 },
-                "ScaleOutCooldown": {
-                    "type": "number"
+                "Key": {
+                    "type": "string"
                 },
-                "TargetValue": {
-                    "type": "number"
+                "Version": {
+                    "type": "string"
                 }
             },
             "required": [
-                "TargetValue"
+                "Bucket",
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account": {
+        "AWS::Bedrock::PromptVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26021,18 +27653,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExpiryEventsConfiguration": {
-                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PromptArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
                     "required": [
-                        "ExpiryEventsConfiguration"
+                        "PromptArn"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Account"
+                        "AWS::Bedrock::PromptVersion"
                     ],
                     "type": "string"
                 },
@@ -26051,16 +27695,107 @@
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+        "AWS::Bedrock::PromptVersion.PromptInferenceConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "DaysBeforeExpiry": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptInputVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptModelInferenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTokens": {
+                    "type": "number"
+                },
+                "StopSequences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Temperature": {
+                    "type": "number"
+                },
+                "TopK": {
+                    "type": "number"
+                },
+                "TopP": {
                     "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate": {
+        "AWS::Bedrock::PromptVersion.PromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.PromptVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "InferenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInferenceConfiguration"
+                },
+                "ModelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TemplateConfiguration": {
+                    "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptTemplateConfiguration"
+                },
+                "TemplateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "TemplateType"
+            ],
+            "type": "object"
+        },
+        "AWS::Bedrock::PromptVersion.TextPromptTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Bedrock::PromptVersion.PromptInputVariable"
+                    },
+                    "type": "array"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26095,48 +27830,39 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CertificateAuthorityArn": {
-                            "type": "string"
+                        "AccountGrouping": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.AccountGrouping"
                         },
-                        "CertificateTransparencyLoggingPreference": {
-                            "type": "string"
+                        "ComputationPreference": {
+                            "$ref": "#/definitions/AWS::BillingConductor::BillingGroup.ComputationPreference"
                         },
-                        "DomainName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "DomainValidationOptions": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
-                            },
-                            "type": "array"
-                        },
-                        "KeyAlgorithm": {
+                        "Name": {
                             "type": "string"
                         },
-                        "SubjectAlternativeNames": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "PrimaryAccountId": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ValidationMethod": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "DomainName"
+                        "AccountGrouping",
+                        "ComputationPreference",
+                        "Name",
+                        "PrimaryAccountId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CertificateManager::Certificate"
+                        "AWS::BillingConductor::BillingGroup"
                     ],
                     "type": "string"
                 },
@@ -26155,25 +27881,37 @@
             ],
             "type": "object"
         },
-        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+        "AWS::BillingConductor::BillingGroup.AccountGrouping": {
             "additionalProperties": false,
             "properties": {
-                "DomainName": {
-                    "type": "string"
-                },
-                "HostedZoneId": {
-                    "type": "string"
+                "AutoAssociate": {
+                    "type": "boolean"
                 },
-                "ValidationDomain": {
+                "LinkedAccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LinkedAccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::BillingGroup.ComputationPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "PricingPlanArn": {
                     "type": "string"
                 }
             },
             "required": [
-                "DomainName"
+                "PricingPlanArn"
             ],
             "type": "object"
         },
-        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26208,52 +27946,40 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
-                            "type": "string"
-                        },
-                        "GuardrailPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "IamRoleArn": {
+                        "AccountId": {
                             "type": "string"
                         },
-                        "LoggingLevel": {
+                        "BillingGroupArn": {
                             "type": "string"
                         },
-                        "SnsTopicArns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "BillingPeriodRange": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.BillingPeriodRange"
                         },
-                        "TeamId": {
-                            "type": "string"
+                        "CustomLineItemChargeDetails": {
+                            "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails"
                         },
-                        "TeamsChannelId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TeamsTenantId": {
+                        "Name": {
                             "type": "string"
                         },
-                        "UserRoleRequired": {
-                            "type": "boolean"
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "TeamId",
-                        "TeamsChannelId",
-                        "TeamsTenantId"
+                        "BillingGroupArn",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
+                        "AWS::BillingConductor::CustomLineItem"
                     ],
                     "type": "string"
                 },
@@ -26272,7 +27998,96 @@
             ],
             "type": "object"
         },
-        "AWS::Chatbot::SlackChannelConfiguration": {
+        "AWS::BillingConductor::CustomLineItem.BillingPeriodRange": {
+            "additionalProperties": false,
+            "properties": {
+                "ExclusiveEndBillingPeriod": {
+                    "type": "string"
+                },
+                "InclusiveStartBillingPeriod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Flat": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails"
+                },
+                "LineItemFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.LineItemFilter"
+                    },
+                    "type": "array"
+                },
+                "Percentage": {
+                    "$ref": "#/definitions/AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemFlatChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChargeValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChargeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.CustomLineItemPercentageChargeDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssociatedResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PercentageValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "PercentageValue"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::CustomLineItem.LineItemFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MatchOption": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attribute",
+                "MatchOption",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::BillingConductor::PricingPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26307,48 +28122,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfigurationName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "GuardrailPolicies": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PricingRuleArns": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "IamRoleArn": {
-                            "type": "string"
-                        },
-                        "LoggingLevel": {
-                            "type": "string"
-                        },
-                        "SlackChannelId": {
-                            "type": "string"
-                        },
-                        "SlackWorkspaceId": {
-                            "type": "string"
-                        },
-                        "SnsTopicArns": {
+                        "Tags": {
                             "items": {
-                                "type": "string"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserRoleRequired": {
-                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "ConfigurationName",
-                        "IamRoleArn",
-                        "SlackChannelId",
-                        "SlackWorkspaceId"
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Chatbot::SlackChannelConfiguration"
+                        "AWS::BillingConductor::PricingPlan"
                     ],
                     "type": "string"
                 },
@@ -26367,7 +28167,7 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate": {
+        "AWS::BillingConductor::PricingRule": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26402,45 +28202,53 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AnalysisParameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
-                            },
-                            "type": "array"
+                        "BillingEntity": {
+                            "type": "string"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "Format": {
+                        "ModifierPercentage": {
+                            "type": "number"
+                        },
+                        "Name": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Operation": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Scope": {
                             "type": "string"
                         },
-                        "Source": {
-                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        "Service": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "Tiering": {
+                            "$ref": "#/definitions/AWS::BillingConductor::PricingRule.Tiering"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UsageType": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "MembershipIdentifier",
                         "Name",
-                        "Source"
+                        "Scope",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::AnalysisTemplate"
+                        "AWS::BillingConductor::PricingRule"
                     ],
                     "type": "string"
                 },
@@ -26459,53 +28267,28 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
-            "additionalProperties": false,
-            "properties": {
-                "DefaultValue": {
-                    "type": "string"
-                },
-                "Name": {
-                    "type": "string"
-                },
-                "Type": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name",
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+        "AWS::BillingConductor::PricingRule.FreeTier": {
             "additionalProperties": false,
             "properties": {
-                "ReferencedTables": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Activated": {
+                    "type": "boolean"
                 }
             },
             "required": [
-                "ReferencedTables"
+                "Activated"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+        "AWS::BillingConductor::PricingRule.Tiering": {
             "additionalProperties": false,
             "properties": {
-                "Text": {
-                    "type": "string"
+                "FreeTier": {
+                    "$ref": "#/definitions/AWS::BillingConductor::PricingRule.FreeTier"
                 }
             },
-            "required": [
-                "Text"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration": {
+        "AWS::Budgets::Budget": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -26540,56 +28323,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CreatorDisplayName": {
-                            "type": "string"
-                        },
-                        "CreatorMemberAbilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "CreatorPaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
-                        },
-                        "DataEncryptionMetadata": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
-                        },
-                        "Description": {
-                            "type": "string"
+                        "Budget": {
+                            "$ref": "#/definitions/AWS::Budgets::Budget.BudgetData"
                         },
-                        "Members": {
+                        "NotificationsWithSubscribers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.NotificationWithSubscribers"
                             },
                             "type": "array"
                         },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "QueryLogStatus": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::Budget.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "CreatorDisplayName",
-                        "CreatorMemberAbilities",
-                        "Description",
-                        "Members",
-                        "Name",
-                        "QueryLogStatus"
+                        "Budget"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Collaboration"
+                        "AWS::Budgets::Budget"
                     ],
                     "type": "string"
                 },
@@ -26608,89 +28365,219 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+        "AWS::Budgets::Budget.AutoAdjustData": {
             "additionalProperties": false,
             "properties": {
-                "AllowCleartext": {
-                    "type": "boolean"
-                },
-                "AllowDuplicates": {
-                    "type": "boolean"
-                },
-                "AllowJoinsOnColumnsWithDifferentNames": {
-                    "type": "boolean"
+                "AutoAdjustType": {
+                    "type": "string"
                 },
-                "PreserveNulls": {
-                    "type": "boolean"
+                "HistoricalOptions": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.HistoricalOptions"
                 }
             },
             "required": [
-                "AllowCleartext",
-                "AllowDuplicates",
-                "AllowJoinsOnColumnsWithDifferentNames",
-                "PreserveNulls"
+                "AutoAdjustType"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+        "AWS::Budgets::Budget.BudgetData": {
             "additionalProperties": false,
             "properties": {
-                "AccountId": {
+                "AutoAdjustData": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.AutoAdjustData"
+                },
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
                     "type": "string"
                 },
-                "DisplayName": {
+                "BudgetType": {
                     "type": "string"
                 },
-                "MemberAbilities": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "CostFilters": {
+                    "type": "object"
                 },
-                "PaymentConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AccountId",
-                "DisplayName",
-                "MemberAbilities"
+                "BudgetType",
+                "TimeUnit"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+        "AWS::Budgets::Budget.CostTypes": {
             "additionalProperties": false,
             "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                "IncludeCredit": {
+                    "type": "boolean"
+                },
+                "IncludeDiscount": {
+                    "type": "boolean"
+                },
+                "IncludeOtherSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeRecurring": {
+                    "type": "boolean"
+                },
+                "IncludeRefund": {
+                    "type": "boolean"
+                },
+                "IncludeSubscription": {
+                    "type": "boolean"
+                },
+                "IncludeSupport": {
+                    "type": "boolean"
+                },
+                "IncludeTax": {
+                    "type": "boolean"
+                },
+                "IncludeUpfront": {
+                    "type": "boolean"
+                },
+                "UseAmortized": {
+                    "type": "boolean"
+                },
+                "UseBlended": {
+                    "type": "boolean"
                 }
             },
-            "required": [
-                "QueryCompute"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+        "AWS::Budgets::Budget.HistoricalOptions": {
             "additionalProperties": false,
             "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
+                "BudgetAdjustmentPeriod": {
+                    "type": "number"
                 }
             },
             "required": [
-                "IsResponsible"
+                "BudgetAdjustmentPeriod"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable": {
+        "AWS::Budgets::Budget.Notification": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "ComparisonOperator": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
+                "NotificationType": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "ThresholdType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "NotificationType",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.NotificationWithSubscribers": {
+            "additionalProperties": false,
+            "properties": {
+                "Notification": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Notification"
+                },
+                "Subscribers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Budgets::Budget.Subscriber"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Notification",
+                "Subscribers"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Spend": {
+            "additionalProperties": false,
+            "properties": {
+                "Amount": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Amount",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "SubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "SubscriptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.TimePeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
                         "Retain",
                         "Snapshot"
                     ],
@@ -26717,48 +28604,54 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowedColumns": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
                         },
-                        "AnalysisMethod": {
+                        "ActionType": {
                             "type": "string"
                         },
-                        "AnalysisRules": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
-                            },
-                            "type": "array"
+                        "ApprovalModel": {
+                            "type": "string"
                         },
-                        "Description": {
+                        "BudgetName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
                             "type": "string"
                         },
-                        "TableReference": {
-                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        "NotificationType": {
+                            "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "AllowedColumns",
-                        "AnalysisMethod",
-                        "Name",
-                        "TableReference"
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTable"
+                        "AWS::Budgets::BudgetsAction"
                     ],
                     "type": "string"
                 },
@@ -26777,98 +28670,56 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "ColumnNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "Function": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ColumnNames",
-                "Function"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Type": {
                     "type": "string"
                 },
-                "Minimum": {
+                "Value": {
                     "type": "number"
-                },
-                "Type": {
-                    "type": "string"
                 }
             },
             "required": [
-                "ColumnName",
-                "Minimum",
-                "Type"
+                "Type",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+        "AWS::Budgets::BudgetsAction.Definition": {
             "additionalProperties": false,
             "properties": {
-                "Policy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
                 },
-                "Type": {
-                    "type": "string"
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
                 }
             },
-            "required": [
-                "Policy",
-                "Type"
-            ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AggregateColumns": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
-                    },
-                    "type": "array"
-                },
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "DimensionColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
+                "Groups": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "JoinRequired": {
+                "PolicyArn": {
                     "type": "string"
                 },
-                "OutputConstraints": {
+                "Roles": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "ScalarFunctions": {
+                "Users": {
                     "items": {
                         "type": "string"
                     },
@@ -26876,54 +28727,33 @@
                 }
             },
             "required": [
-                "AggregateColumns",
-                "DimensionColumns",
-                "JoinColumns",
-                "OutputConstraints",
-                "ScalarFunctions"
+                "PolicyArn"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+        "AWS::Budgets::BudgetsAction.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "AllowedAnalyses": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AllowedAnalysisProviders": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
                 },
-                "DifferentialPrivacy": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "AllowedAnalyses"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "AllowedJoinOperators": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "JoinColumns": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "PolicyId": {
+                    "type": "string"
                 },
-                "ListColumns": {
+                "TargetIds": {
                     "items": {
                         "type": "string"
                     },
@@ -26931,94 +28761,51 @@
                 }
             },
             "required": [
-                "JoinColumns",
-                "ListColumns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
-            "additionalProperties": false,
-            "properties": {
-                "V1": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
-                }
-            },
-            "required": [
-                "V1"
+                "PolicyId",
+                "TargetIds"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
-            "additionalProperties": false,
-            "properties": {
-                "Aggregation": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
-                },
-                "Custom": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
-                },
-                "List": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
             "additionalProperties": false,
             "properties": {
-                "Columns": {
+                "InstanceIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "Columns"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
-            "additionalProperties": false,
-            "properties": {
-                "Name": {
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
                     "type": "string"
                 }
             },
             "required": [
-                "Name"
+                "InstanceIds",
+                "Region",
+                "Subtype"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+        "AWS::Budgets::BudgetsAction.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "DatabaseName": {
+                "Address": {
                     "type": "string"
                 },
-                "TableName": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "DatabaseName",
-                "TableName"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::ConfiguredTable.TableReference": {
-            "additionalProperties": false,
-            "properties": {
-                "Glue": {
-                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
-                }
-            },
-            "required": [
-                "Glue"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::ConfiguredTableAssociation": {
+        "AWS::CE::AnomalyMonitor": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27053,39 +28840,34 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ConfiguredTableIdentifier": {
-                            "type": "string"
-                        },
-                        "Description": {
+                        "MonitorDimension": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "MonitorName": {
                             "type": "string"
                         },
-                        "Name": {
+                        "MonitorSpecification": {
                             "type": "string"
                         },
-                        "RoleArn": {
+                        "MonitorType": {
                             "type": "string"
                         },
-                        "Tags": {
+                        "ResourceTags": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalyMonitor.ResourceTag"
                             },
                             "type": "array"
                         }
                     },
                     "required": [
-                        "ConfiguredTableIdentifier",
-                        "MembershipIdentifier",
-                        "Name",
-                        "RoleArn"
+                        "MonitorName",
+                        "MonitorType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::ConfiguredTableAssociation"
+                        "AWS::CE::AnomalyMonitor"
                     ],
                     "type": "string"
                 },
@@ -27104,7 +28886,23 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership": {
+        "AWS::CE::AnomalyMonitor.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27139,34 +28937,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CollaborationIdentifier": {
+                        "Frequency": {
                             "type": "string"
                         },
-                        "DefaultResultConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
-                        },
-                        "PaymentConfiguration": {
-                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
+                        "MonitorArnList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "QueryLogStatus": {
-                            "type": "string"
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.ResourceTag"
+                            },
+                            "type": "array"
                         },
-                        "Tags": {
+                        "Subscribers": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
                             },
                             "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdExpression": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CollaborationIdentifier",
-                        "QueryLogStatus"
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::Membership"
+                        "AWS::CE::AnomalySubscription"
                     ],
                     "type": "string"
                 },
@@ -27185,77 +28997,42 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "QueryCompute": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
-                }
-            },
-            "required": [
-                "QueryCompute"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
-                }
-            },
-            "required": [
-                "S3"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+        "AWS::CE::AnomalySubscription.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "OutputConfiguration": {
-                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                "Key": {
+                    "type": "string"
                 },
-                "RoleArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "OutputConfiguration"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IsResponsible": {
-                    "type": "boolean"
-                }
-            },
-            "required": [
-                "IsResponsible"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+        "AWS::CE::AnomalySubscription.Subscriber": {
             "additionalProperties": false,
             "properties": {
-                "Bucket": {
+                "Address": {
                     "type": "string"
                 },
-                "KeyPrefix": {
+                "Status": {
                     "type": "string"
                 },
-                "ResultFormat": {
+                "Type": {
                     "type": "string"
                 }
             },
             "required": [
-                "Bucket",
-                "ResultFormat"
+                "Address",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate": {
+        "AWS::CE::CostCategory": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27290,36 +29067,32 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoRefresh": {
+                        "DefaultValue": {
                             "type": "string"
                         },
-                        "MembershipIdentifier": {
+                        "Name": {
                             "type": "string"
                         },
-                        "Parameters": {
-                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        "RuleVersion": {
+                            "type": "string"
                         },
-                        "PrivacyBudgetType": {
+                        "Rules": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
+                        "SplitChargeRules": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AutoRefresh",
-                        "MembershipIdentifier",
-                        "Parameters",
-                        "PrivacyBudgetType"
+                        "Name",
+                        "RuleVersion",
+                        "Rules"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRooms::PrivacyBudgetTemplate"
+                        "AWS::CE::CostCategory"
                     ],
                     "type": "string"
                 },
@@ -27338,23 +29111,7 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
-            "additionalProperties": false,
-            "properties": {
-                "Epsilon": {
-                    "type": "number"
-                },
-                "UsersNoisePerQuery": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Epsilon",
-                "UsersNoisePerQuery"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset": {
+        "AWS::CUR::ReportDefinition": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27389,38 +29146,65 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "AdditionalArtifacts": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "TrainingData": {
+                        "AdditionalSchemaElements": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "BillingViewArn": {
+                            "type": "string"
+                        },
+                        "Compression": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "RefreshClosedReports": {
+                            "type": "boolean"
+                        },
+                        "ReportName": {
+                            "type": "string"
+                        },
+                        "ReportVersioning": {
+                            "type": "string"
+                        },
+                        "S3Bucket": {
+                            "type": "string"
+                        },
+                        "S3Prefix": {
+                            "type": "string"
+                        },
+                        "S3Region": {
+                            "type": "string"
+                        },
+                        "TimeUnit": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Name",
-                        "RoleArn",
-                        "TrainingData"
+                        "Compression",
+                        "Format",
+                        "RefreshClosedReports",
+                        "ReportName",
+                        "ReportVersioning",
+                        "S3Bucket",
+                        "S3Prefix",
+                        "S3Region",
+                        "TimeUnit"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CleanRoomsML::TrainingDataset"
+                        "AWS::CUR::ReportDefinition"
                     ],
                     "type": "string"
                 },
@@ -27439,92 +29223,92 @@
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
+        "AWS::Cassandra::Keyspace": {
             "additionalProperties": false,
             "properties": {
-                "ColumnName": {
+                "Condition": {
                     "type": "string"
                 },
-                "ColumnTypes": {
-                    "items": {
-                        "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": {
+                        "KeyspaceName": {
+                            "type": "string"
+                        },
+                        "ReplicationSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace.ReplicationSpecification"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
                     },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "ColumnName",
-                "ColumnTypes"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "GlueDataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
-                }
-            },
-            "required": [
-                "GlueDataSource"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
-            "additionalProperties": false,
-            "properties": {
-                "InputConfig": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "InputConfig",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
+        "AWS::Cassandra::Keyspace.ReplicationSpecification": {
             "additionalProperties": false,
             "properties": {
-                "DataSource": {
-                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
-                },
-                "Schema": {
+                "RegionList": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
+                        "type": "string"
                     },
                     "type": "array"
-                }
-            },
-            "required": [
-                "DataSource",
-                "Schema"
-            ],
-            "type": "object"
-        },
-        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
-            "additionalProperties": false,
-            "properties": {
-                "CatalogId": {
-                    "type": "string"
-                },
-                "DatabaseName": {
-                    "type": "string"
                 },
-                "TableName": {
+                "ReplicationStrategy": {
                     "type": "string"
                 }
             },
-            "required": [
-                "DatabaseName",
-                "TableName"
-            ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2": {
+        "AWS::Cassandra::Table": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27559,34 +29343,52 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutomaticStopTimeMinutes": {
-                            "type": "number"
+                        "AutoScalingSpecifications": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSpecification"
                         },
-                        "ConnectionType": {
-                            "type": "string"
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
                         },
-                        "Description": {
-                            "type": "string"
+                        "ClientSideTimestampsEnabled": {
+                            "type": "boolean"
                         },
-                        "ImageId": {
-                            "type": "string"
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
                         },
-                        "InstanceType": {
-                            "type": "string"
+                        "DefaultTimeToLive": {
+                            "type": "number"
                         },
-                        "Name": {
-                            "type": "string"
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
                         },
-                        "OwnerArn": {
+                        "KeyspaceName": {
                             "type": "string"
                         },
-                        "Repositories": {
+                        "PartitionKeyColumns": {
                             "items": {
-                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
                             },
                             "type": "array"
                         },
-                        "SubnetId": {
+                        "PointInTimeRecoveryEnabled": {
+                            "type": "boolean"
+                        },
+                        "RegularColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                            },
+                            "type": "array"
+                        },
+                        "ReplicaSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TableName": {
                             "type": "string"
                         },
                         "Tags": {
@@ -27597,14 +29399,14 @@
                         }
                     },
                     "required": [
-                        "ImageId",
-                        "InstanceType"
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Cloud9::EnvironmentEC2"
+                        "AWS::Cassandra::Table"
                     ],
                     "type": "string"
                 },
@@ -27623,23 +29425,162 @@
             ],
             "type": "object"
         },
-        "AWS::Cloud9::EnvironmentEC2.Repository": {
+        "AWS::Cassandra::Table.AutoScalingSetting": {
             "additionalProperties": false,
             "properties": {
-                "PathComponent": {
+                "AutoScalingDisabled": {
+                    "type": "boolean"
+                },
+                "MaximumUnits": {
+                    "type": "number"
+                },
+                "MinimumUnits": {
+                    "type": "number"
+                },
+                "ScalingPolicy": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ScalingPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.AutoScalingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "WriteCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.BillingMode": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
                     "type": "string"
                 },
-                "RepositoryUrl": {
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ClusteringKeyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.Column"
+                },
+                "OrderBy": {
                     "type": "string"
                 }
             },
             "required": [
-                "PathComponent",
-                "RepositoryUrl"
+                "Column"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::CustomResource": {
+        "AWS::Cassandra::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "ColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "ColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.EncryptionSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKeyIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScaling": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.AutoScalingSetting"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cassandra::Table.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27674,18 +29615,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ServiceToken": {
-                            "type": "string"
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
                         }
                     },
                     "required": [
-                        "ServiceToken"
+                        "ExpiryEventsConfiguration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::CustomResource"
+                        "AWS::CertificateManager::Account"
                     ],
                     "type": "string"
                 },
@@ -27704,7 +29645,16 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookDefaultVersion": {
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27739,21 +29689,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "CertificateAuthorityArn": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "CertificateTransparencyLoggingPreference": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DomainName"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookDefaultVersion"
+                        "AWS::CertificateManager::Certificate"
                     ],
                     "type": "string"
                 },
@@ -27767,11 +29744,30 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookTypeConfig": {
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27806,27 +29802,58 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Configuration": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "ConfigurationAlias": {
-                            "type": "string"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "TypeArn": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
                             "type": "string"
-                        }
-                    },
-                    "required": [
-                        "Configuration"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TeamsChannelId": {
+                            "type": "string"
+                        },
+                        "TeamsTenantId": {
+                            "type": "string"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "TeamId",
+                        "TeamsChannelId",
+                        "TeamsTenantId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookTypeConfig"
+                        "AWS::Chatbot::MicrosoftTeamsChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27845,7 +29872,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion": {
+        "AWS::Chatbot::SlackChannelConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27880,28 +29907,54 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "ConfigurationName": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "SchemaHandlerPackage": {
+                        "IamRoleArn": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
                             "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::HookVersion"
+                        "AWS::Chatbot::SlackChannelConfiguration"
                     ],
                     "type": "string"
                 },
@@ -27920,19 +29973,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::HookVersion.LoggingConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "LogGroupName": {
-                    "type": "string"
-                },
-                "LogRoleArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::CloudFormation::Macro": {
+        "AWS::CleanRooms::AnalysisTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -27967,31 +30008,45 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Description": {
-                            "type": "string"
+                        "AnalysisParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisParameter"
+                            },
+                            "type": "array"
                         },
-                        "FunctionName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "LogGroupName": {
+                        "Format": {
                             "type": "string"
                         },
-                        "LogRoleARN": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
                         "Name": {
                             "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::CleanRooms::AnalysisTemplate.AnalysisSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "FunctionName",
-                        "Name"
+                        "Format",
+                        "MembershipIdentifier",
+                        "Name",
+                        "Source"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Macro"
+                        "AWS::CleanRooms::AnalysisTemplate"
                     ],
                     "type": "string"
                 },
@@ -28010,7 +30065,53 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleDefaultVersion": {
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferencedTables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ReferencedTables"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::AnalysisTemplate.AnalysisSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28045,21 +30146,56 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "CreatorDisplayName": {
                             "type": "string"
                         },
-                        "ModuleName": {
+                        "CreatorMemberAbilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CreatorPaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                        },
+                        "DataEncryptionMetadata": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Collaboration.DataEncryptionMetadata"
+                        },
+                        "Description": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::Collaboration.MemberSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "CreatorDisplayName",
+                        "CreatorMemberAbilities",
+                        "Description",
+                        "Members",
+                        "Name",
+                        "QueryLogStatus"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleDefaultVersion"
+                        "AWS::CleanRooms::Collaboration"
                     ],
                     "type": "string"
                 },
@@ -28073,11 +30209,86 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ModuleVersion": {
+        "AWS::CleanRooms::Collaboration.DataEncryptionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCleartext": {
+                    "type": "boolean"
+                },
+                "AllowDuplicates": {
+                    "type": "boolean"
+                },
+                "AllowJoinsOnColumnsWithDifferentNames": {
+                    "type": "boolean"
+                },
+                "PreserveNulls": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowCleartext",
+                "AllowDuplicates",
+                "AllowJoinsOnColumnsWithDifferentNames",
+                "PreserveNulls"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.MemberSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "MemberAbilities": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PaymentConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.PaymentConfiguration"
+                }
+            },
+            "required": [
+                "AccountId",
+                "DisplayName",
+                "MemberAbilities"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.PaymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Collaboration.QueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Collaboration.QueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28112,22 +30323,48 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ModuleName": {
+                        "AllowedColumns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalysisMethod": {
                             "type": "string"
                         },
-                        "ModulePackage": {
+                        "AnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "TableReference": {
+                            "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.TableReference"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "ModuleName",
-                        "ModulePackage"
+                        "AllowedColumns",
+                        "AnalysisMethod",
+                        "Name",
+                        "TableReference"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ModuleVersion"
+                        "AWS::CleanRooms::ConfiguredTable"
                     ],
                     "type": "string"
                 },
@@ -28146,7 +30383,263 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::PublicTypeVersion": {
+        "AWS::CleanRooms::ConfiguredTable.AggregateColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnNames",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AggregationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Minimum": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Minimum",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AggregateColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregateColumn"
+                    },
+                    "type": "array"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DimensionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinRequired": {
+                    "type": "string"
+                },
+                "OutputConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AggregationConstraint"
+                    },
+                    "type": "array"
+                },
+                "ScalarFunctions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AggregateColumns",
+                "DimensionColumns",
+                "JoinColumns",
+                "OutputConstraints",
+                "ScalarFunctions"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedAnalysisProviders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DifferentialPrivacy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy"
+                },
+                "DisallowedOutputColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AllowedAnalyses"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.AnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalAnalyses": {
+                    "type": "string"
+                },
+                "AllowedJoinOperators": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JoinColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ListColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "JoinColumns",
+                "ListColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.ConfiguredTableAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.AnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacy": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.DifferentialPrivacyColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.GlueTableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTable.TableReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Glue": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTable.GlueTableReference"
+                }
+            },
+            "required": [
+                "Glue"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28181,27 +30674,45 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Arn": {
+                        "ConfiguredTableAssociationAnalysisRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule"
+                            },
+                            "type": "array"
+                        },
+                        "ConfiguredTableIdentifier": {
                             "type": "string"
                         },
-                        "LogDeliveryBucket": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicVersionNumber": {
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ConfiguredTableIdentifier",
+                        "MembershipIdentifier",
+                        "Name",
+                        "RoleArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::PublicTypeVersion"
+                        "AWS::CleanRooms::ConfiguredTableAssociation"
                     ],
                     "type": "string"
                 },
@@ -28215,11 +30726,109 @@
                 }
             },
             "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Policy": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Policy",
                 "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::Publisher": {
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedAdditionalAnalyses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedResultReceivers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "V1": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1"
+                }
+            },
+            "required": [
+                "V1"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRulePolicyV1": {
+            "additionalProperties": false,
+            "properties": {
+                "Aggregation": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleAggregation"
+                },
+                "Custom": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleCustom"
+                },
+                "List": {
+                    "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation.ConfiguredTableAssociationAnalysisRuleList"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28254,21 +30863,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AcceptTermsAndConditions": {
-                            "type": "boolean"
+                        "Description": {
+                            "type": "string"
                         },
-                        "ConnectionArn": {
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "AcceptTermsAndConditions"
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Publisher"
+                        "AWS::CleanRooms::IdMappingTable"
                     ],
                     "type": "string"
                 },
@@ -28287,7 +30913,54 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceDefaultVersion": {
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingTableInputSource": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "IdMappingTableInputSource"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdMappingTable.IdMappingTableInputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "IdNamespaceAssociationId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdNamespaceAssociationId",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28322,21 +30995,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "TypeName": {
+                        "Description": {
                             "type": "string"
                         },
-                        "TypeVersionArn": {
+                        "IdMappingConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig"
+                        },
+                        "InputReferenceConfig": {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig"
+                        },
+                        "MembershipIdentifier": {
                             "type": "string"
                         },
-                        "VersionId": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "InputReferenceConfig",
+                        "MembershipIdentifier",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceDefaultVersion"
+                        "AWS::CleanRooms::IdNamespaceAssociation"
                     ],
                     "type": "string"
                 },
@@ -28350,11 +31040,55 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion": {
+        "AWS::CleanRooms::IdNamespaceAssociation.IdMappingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowUseAsDimensionColumn": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AllowUseAsDimensionColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InputReferenceArn": {
+                    "type": "string"
+                },
+                "ManageResourcePolicies": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "InputReferenceArn",
+                "ManageResourcePolicies"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::IdNamespaceAssociation.IdNamespaceAssociationInputReferenceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IdMappingWorkflowsSupported": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "IdNamespaceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28389,28 +31123,34 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ExecutionRoleArn": {
+                        "CollaborationIdentifier": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        "DefaultResultConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration"
                         },
-                        "SchemaHandlerPackage": {
-                            "type": "string"
+                        "PaymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipPaymentConfiguration"
                         },
-                        "TypeName": {
+                        "QueryLogStatus": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "SchemaHandlerPackage",
-                        "TypeName"
+                        "CollaborationIdentifier",
+                        "QueryLogStatus"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::ResourceVersion"
+                        "AWS::CleanRooms::Membership"
                     ],
                     "type": "string"
                 },
@@ -28429,19 +31169,77 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+        "AWS::CleanRooms::Membership.MembershipPaymentConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "QueryCompute": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig"
+                }
+            },
+            "required": [
+                "QueryCompute"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipProtectedQueryResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputConfiguration": {
+                    "$ref": "#/definitions/AWS::CleanRooms::Membership.MembershipProtectedQueryOutputConfiguration"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OutputConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.MembershipQueryComputePaymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IsResponsible": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsResponsible"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRooms::Membership.ProtectedQueryS3OutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "ResultFormat": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Bucket",
+                "ResultFormat"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::Stack": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28476,42 +31274,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "NotificationARNs": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
+                        "AutoRefresh": {
+                            "type": "string"
+                        },
+                        "MembershipIdentifier": {
+                            "type": "string"
                         },
                         "Parameters": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
+                            "$ref": "#/definitions/AWS::CleanRooms::PrivacyBudgetTemplate.Parameters"
+                        },
+                        "PrivacyBudgetType": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
-                        },
-                        "TimeoutInMinutes": {
-                            "type": "number"
                         }
                     },
                     "required": [
-                        "TemplateURL"
+                        "AutoRefresh",
+                        "MembershipIdentifier",
+                        "Parameters",
+                        "PrivacyBudgetType"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::Stack"
+                        "AWS::CleanRooms::PrivacyBudgetTemplate"
                     ],
                     "type": "string"
                 },
@@ -28530,7 +31322,23 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet": {
+        "AWS::CleanRooms::PrivacyBudgetTemplate.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Epsilon": {
+                    "type": "number"
+                },
+                "UsersNoisePerQuery": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Epsilon",
+                "UsersNoisePerQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::CleanRoomsML::TrainingDataset": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28565,73 +31373,38 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AdministrationRoleARN": {
-                            "type": "string"
-                        },
-                        "AutoDeployment": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
-                        },
-                        "CallAs": {
-                            "type": "string"
-                        },
-                        "Capabilities": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Description": {
                             "type": "string"
                         },
-                        "ExecutionRoleName": {
+                        "Name": {
                             "type": "string"
                         },
-                        "ManagedExecution": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
-                        },
-                        "OperationPreferences": {
-                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
-                        },
-                        "Parameters": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                            },
-                            "type": "array"
-                        },
-                        "PermissionModel": {
+                        "RoleArn": {
                             "type": "string"
                         },
-                        "StackInstancesGroup": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                                "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
                         },
-                        "StackSetName": {
-                            "type": "string"
-                        },
-                        "Tags": {
+                        "TrainingData": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.Dataset"
                             },
                             "type": "array"
-                        },
-                        "TemplateBody": {
-                            "type": "string"
-                        },
-                        "TemplateURL": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "PermissionModel",
-                        "StackSetName"
+                        "Name",
+                        "RoleArn",
+                        "TrainingData"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::StackSet"
+                        "AWS::CleanRoomsML::TrainingDataset"
                     ],
                     "type": "string"
                 },
@@ -28650,120 +31423,92 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.AutoDeployment": {
+        "AWS::CleanRoomsML::TrainingDataset.ColumnSchema": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "ColumnName": {
+                    "type": "string"
                 },
-                "RetainStacksOnAccountRemoval": {
-                    "type": "boolean"
+                "ColumnTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "ColumnTypes"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+        "AWS::CleanRoomsML::TrainingDataset.DataSource": {
             "additionalProperties": false,
             "properties": {
-                "AccountFilterType": {
-                    "type": "string"
-                },
-                "Accounts": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "AccountsUrl": {
-                    "type": "string"
-                },
-                "OrganizationalUnitIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "GlueDataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.GlueDataSource"
                 }
             },
+            "required": [
+                "GlueDataSource"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.ManagedExecution": {
+        "AWS::CleanRoomsML::TrainingDataset.Dataset": {
             "additionalProperties": false,
             "properties": {
-                "Active": {
-                    "type": "boolean"
+                "InputConfig": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "InputConfig",
+                "Type"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.OperationPreferences": {
+        "AWS::CleanRoomsML::TrainingDataset.DatasetInputConfig": {
             "additionalProperties": false,
             "properties": {
-                "FailureToleranceCount": {
-                    "type": "number"
-                },
-                "FailureTolerancePercentage": {
-                    "type": "number"
-                },
-                "MaxConcurrentCount": {
-                    "type": "number"
-                },
-                "MaxConcurrentPercentage": {
-                    "type": "number"
-                },
-                "RegionConcurrencyType": {
-                    "type": "string"
+                "DataSource": {
+                    "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.DataSource"
                 },
-                "RegionOrder": {
+                "Schema": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::CleanRoomsML::TrainingDataset.ColumnSchema"
                     },
                     "type": "array"
                 }
             },
-            "type": "object"
-        },
-        "AWS::CloudFormation::StackSet.Parameter": {
-            "additionalProperties": false,
-            "properties": {
-                "ParameterKey": {
-                    "type": "string"
-                },
-                "ParameterValue": {
-                    "type": "string"
-                }
-            },
             "required": [
-                "ParameterKey",
-                "ParameterValue"
+                "DataSource",
+                "Schema"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::StackSet.StackInstances": {
+        "AWS::CleanRoomsML::TrainingDataset.GlueDataSource": {
             "additionalProperties": false,
             "properties": {
-                "DeploymentTargets": {
-                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
+                "CatalogId": {
+                    "type": "string"
                 },
-                "ParameterOverrides": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
-                    },
-                    "type": "array"
+                "DatabaseName": {
+                    "type": "string"
                 },
-                "Regions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "TableName": {
+                    "type": "string"
                 }
             },
             "required": [
-                "DeploymentTargets",
-                "Regions"
+                "DatabaseName",
+                "TableName"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation": {
+        "AWS::Cloud9::EnvironmentEC2": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28798,42 +31543,52 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AutoUpdate": {
-                            "type": "boolean"
+                        "AutomaticStopTimeMinutes": {
+                            "type": "number"
                         },
-                        "ExecutionRoleArn": {
+                        "ConnectionType": {
                             "type": "string"
                         },
-                        "LoggingConfig": {
-                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
-                        },
-                        "MajorVersion": {
+                        "Description": {
                             "type": "string"
                         },
-                        "PublicTypeArn": {
+                        "ImageId": {
                             "type": "string"
                         },
-                        "PublisherId": {
+                        "InstanceType": {
                             "type": "string"
                         },
-                        "Type": {
+                        "Name": {
                             "type": "string"
                         },
-                        "TypeName": {
+                        "OwnerArn": {
                             "type": "string"
                         },
-                        "TypeNameAlias": {
-                            "type": "string"
+                        "Repositories": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2.Repository"
+                            },
+                            "type": "array"
                         },
-                        "VersionBump": {
+                        "SubnetId": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::TypeActivation"
+                        "AWS::Cloud9::EnvironmentEC2"
                     ],
                     "type": "string"
                 },
@@ -28847,31 +31602,33 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
             "additionalProperties": false,
             "properties": {
-                "LogGroupName": {
+                "PathComponent": {
                     "type": "string"
                 },
-                "LogRoleArn": {
+                "RepositoryUrl": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitCondition": {
+        "AWS::CloudFormation::CustomResource": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
                     "type": "string"
                 },
-                "CreationPolicy": {
-                    "type": "object"
-                },
                 "DeletionPolicy": {
                     "enum": [
                         "Delete",
@@ -28901,21 +31658,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Count": {
+                        "ServiceTimeout": {
                             "type": "number"
                         },
-                        "Handle": {
-                            "type": "string"
-                        },
-                        "Timeout": {
+                        "ServiceToken": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ServiceToken"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitCondition"
+                        "AWS::CloudFormation::CustomResource"
                     ],
                     "type": "string"
                 },
@@ -28929,11 +31686,12 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFormation::WaitConditionHandle": {
+        "AWS::CloudFormation::HookDefaultVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -28967,12 +31725,22 @@
                 },
                 "Properties": {
                     "additionalProperties": false,
-                    "properties": {},
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFormation::WaitConditionHandle"
+                        "AWS::CloudFormation::HookDefaultVersion"
                     ],
                     "type": "string"
                 },
@@ -28990,7 +31758,7 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy": {
+        "AWS::CloudFormation::HookTypeConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29025,18 +31793,27 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CachePolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "ConfigurationAlias": {
+                            "type": "string"
+                        },
+                        "TypeArn": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CachePolicyConfig"
+                        "Configuration"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CachePolicy"
+                        "AWS::CloudFormation::HookTypeConfig"
                     ],
                     "type": "string"
                 },
@@ -29055,119 +31832,239 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+        "AWS::CloudFormation::HookVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "Condition": {
                     "type": "string"
                 },
-                "DefaultTTL": {
-                    "type": "number"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "MaxTTL": {
-                    "type": "number"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "MinTTL": {
-                    "type": "number"
+                "Metadata": {
+                    "type": "object"
                 },
-                "Name": {
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::HookVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::HookVersion"
+                    ],
                     "type": "string"
                 },
-                "ParametersInCacheKeyAndForwardedToOrigin": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "DefaultTTL",
-                "MaxTTL",
-                "MinTTL",
-                "Name",
-                "ParametersInCacheKeyAndForwardedToOrigin"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+        "AWS::CloudFormation::HookVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "CookieBehavior": {
+                "LogGroupName": {
                     "type": "string"
                 },
-                "Cookies": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "CookieBehavior"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+        "AWS::CloudFormation::Macro": {
             "additionalProperties": false,
             "properties": {
-                "HeaderBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "Headers": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "HeaderBehavior"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
-            "additionalProperties": false,
-            "properties": {
-                "CookiesConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "EnableAcceptEncodingBrotli": {
-                    "type": "boolean"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "EnableAcceptEncodingGzip": {
-                    "type": "boolean"
+                "Metadata": {
+                    "type": "object"
                 },
-                "HeadersConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
                 },
-                "QueryStringsConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "CookiesConfig",
-                "EnableAcceptEncodingGzip",
-                "HeadersConfig",
-                "QueryStringsConfig"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+        "AWS::CloudFormation::ModuleDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "QueryStringBehavior": {
+                "Condition": {
                     "type": "string"
                 },
-                "QueryStrings": {
-                    "items": {
-                        "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
                     },
-                    "type": "array"
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "QueryStringBehavior"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+        "AWS::CloudFormation::ModuleVersion": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29202,18 +32099,22 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CloudFrontOriginAccessIdentityConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "CloudFrontOriginAccessIdentityConfig"
+                        "ModuleName",
+                        "ModulePackage"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        "AWS::CloudFormation::ModuleVersion"
                     ],
                     "type": "string"
                 },
@@ -29232,19 +32133,80 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+        "AWS::CloudFormation::PublicTypeVersion": {
             "additionalProperties": false,
             "properties": {
-                "Comment": {
+                "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": {
+                        "Arn": {
+                            "type": "string"
+                        },
+                        "LogDeliveryBucket": {
+                            "type": "string"
+                        },
+                        "PublicVersionNumber": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::PublicTypeVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Comment"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+        "AWS::CloudFormation::Publisher": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29279,18 +32241,21 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ContinuousDeploymentPolicyConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "ContinuousDeploymentPolicyConfig"
+                        "AcceptTermsAndConditions"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                        "AWS::CloudFormation::Publisher"
                     ],
                     "type": "string"
                 },
@@ -29309,134 +32274,250 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+        "AWS::CloudFormation::ResourceDefaultVersion": {
             "additionalProperties": false,
             "properties": {
-                "Enabled": {
-                    "type": "boolean"
+                "Condition": {
+                    "type": "string"
                 },
-                "SingleHeaderPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightPolicyConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
                 },
-                "StagingDistributionDnsNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Metadata": {
+                    "type": "object"
                 },
-                "TrafficConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Enabled",
-                "StagingDistributionDnsNames"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "IdleTTL": {
-                    "type": "number"
                 },
-                "MaximumTTL": {
-                    "type": "number"
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 }
             },
             "required": [
-                "IdleTTL",
-                "MaximumTTL"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+        "AWS::CloudFormation::ResourceVersion": {
             "additionalProperties": false,
             "properties": {
-                "Header": {
+                "Condition": {
                     "type": "string"
                 },
-                "Value": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
-                }
-            },
-            "required": [
-                "Header",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "Header": {
+                },
+                "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": {
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion.LoggingConfig"
+                        },
+                        "SchemaHandlerPackage": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SchemaHandlerPackage",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceVersion"
+                    ],
                     "type": "string"
                 },
-                "Value": {
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Header",
-                "Value"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "LogGroupName": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
+                "LogRoleArn": {
+                    "type": "string"
                 }
             },
-            "required": [
-                "Weight"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+        "AWS::CloudFormation::Stack": {
             "additionalProperties": false,
             "properties": {
-                "SessionStickinessConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                "Condition": {
+                    "type": "string"
                 },
-                "Weight": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "Weight"
-            ],
-            "type": "object"
-        },
-        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
-            "additionalProperties": false,
-            "properties": {
-                "SingleHeaderConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
                 },
-                "SingleWeightConfig": {
-                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                "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": {
+                        "NotificationARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "TemplateURL"
+                    ],
+                    "type": "object"
                 },
                 "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
                     "type": "string"
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution": {
+        "AWS::CloudFormation::StackSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -29471,24 +32552,73 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DistributionConfig": {
-                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        "AdministrationRoleARN": {
+                            "type": "string"
+                        },
+                        "AutoDeployment": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.AutoDeployment"
+                        },
+                        "CallAs": {
+                            "type": "string"
+                        },
+                        "Capabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleName": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.ManagedExecution"
+                        },
+                        "OperationPreferences": {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet.OperationPreferences"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionModel": {
+                            "type": "string"
+                        },
+                        "StackInstancesGroup": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudFormation::StackSet.StackInstances"
+                            },
+                            "type": "array"
+                        },
+                        "StackSetName": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateURL": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "DistributionConfig"
+                        "PermissionModel",
+                        "StackSetName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::CloudFront::Distribution"
+                        "AWS::CloudFormation::StackSet"
                     ],
                     "type": "string"
                 },
@@ -29507,142 +32637,1002 @@
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CacheBehavior": {
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
             "additionalProperties": false,
             "properties": {
-                "AllowedMethods": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Enabled": {
+                    "type": "boolean"
                 },
-                "CachePolicyId": {
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountFilterType": {
                     "type": "string"
                 },
-                "CachedMethods": {
+                "Accounts": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Compress": {
-                    "type": "boolean"
-                },
-                "DefaultTTL": {
-                    "type": "number"
-                },
-                "FieldLevelEncryptionId": {
+                "AccountsUrl": {
                     "type": "string"
                 },
-                "ForwardedValues": {
-                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
-                },
-                "FunctionAssociations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
-                    },
-                    "type": "array"
-                },
-                "LambdaFunctionAssociations": {
+                "OrganizationalUnitIds": {
                     "items": {
-                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                        "type": "string"
                     },
                     "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.ManagedExecution": {
+            "additionalProperties": false,
+            "properties": {
+                "Active": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrencyMode": {
+                    "type": "string"
                 },
-                "MaxTTL": {
+                "FailureToleranceCount": {
                     "type": "number"
                 },
-                "MinTTL": {
+                "FailureTolerancePercentage": {
                     "type": "number"
                 },
-                "OriginRequestPolicyId": {
-                    "type": "string"
-                },
-                "PathPattern": {
-                    "type": "string"
-                },
-                "RealtimeLogConfigArn": {
-                    "type": "string"
-                },
-                "ResponseHeadersPolicyId": {
-                    "type": "string"
+                "MaxConcurrentCount": {
+                    "type": "number"
                 },
-                "SmoothStreaming": {
-                    "type": "boolean"
+                "MaxConcurrentPercentage": {
+                    "type": "number"
                 },
-                "TargetOriginId": {
+                "RegionConcurrencyType": {
                     "type": "string"
                 },
-                "TrustedKeyGroups": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TrustedSigners": {
+                "RegionOrder": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
-                },
-                "ViewerProtocolPolicy": {
-                    "type": "string"
                 }
             },
-            "required": [
-                "PathPattern",
-                "TargetOriginId",
-                "ViewerProtocolPolicy"
-            ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.Cookies": {
+        "AWS::CloudFormation::StackSet.Parameter": {
             "additionalProperties": false,
             "properties": {
-                "Forward": {
+                "ParameterKey": {
                     "type": "string"
                 },
-                "WhitelistedNames": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ParameterValue": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Forward"
+                "ParameterKey",
+                "ParameterValue"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+        "AWS::CloudFormation::StackSet.StackInstances": {
             "additionalProperties": false,
             "properties": {
-                "ErrorCachingMinTTL": {
-                    "type": "number"
-                },
-                "ErrorCode": {
-                    "type": "number"
+                "DeploymentTargets": {
+                    "$ref": "#/definitions/AWS::CloudFormation::StackSet.DeploymentTargets"
                 },
-                "ResponseCode": {
-                    "type": "number"
+                "ParameterOverrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFormation::StackSet.Parameter"
+                    },
+                    "type": "array"
                 },
-                "ResponsePagePath": {
-                    "type": "string"
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "ErrorCode"
+                "DeploymentTargets",
+                "Regions"
             ],
             "type": "object"
         },
-        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+        "AWS::CloudFormation::TypeActivation": {
             "additionalProperties": false,
             "properties": {
-                "HTTPPort": {
-                    "type": "number"
+                "Condition": {
+                    "type": "string"
                 },
-                "HTTPSPort": {
-                    "type": "number"
+                "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": {
+                        "AutoUpdate": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingConfig": {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation.LoggingConfig"
+                        },
+                        "MajorVersion": {
+                            "type": "string"
+                        },
+                        "PublicTypeArn": {
+                            "type": "string"
+                        },
+                        "PublisherId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeNameAlias": {
+                            "type": "string"
+                        },
+                        "VersionBump": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::TypeActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::TypeActivation.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "CreationPolicy": {
+                    "type": "object"
+                },
+                "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": {
+                        "Count": {
+                            "type": "number"
+                        },
+                        "Handle": {
+                            "type": "string"
+                        },
+                        "Timeout": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitCondition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::WaitConditionHandle": {
+            "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": {},
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::WaitConditionHandle"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy": {
+            "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": {
+                        "CachePolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CachePolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "CachePolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CachePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CachePolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ParametersInCacheKeyAndForwardedToOrigin": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+                }
+            },
+            "required": [
+                "DefaultTTL",
+                "MaxTTL",
+                "MinTTL",
+                "Name",
+                "ParametersInCacheKeyAndForwardedToOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin": {
+            "additionalProperties": false,
+            "properties": {
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.CookiesConfig"
+                },
+                "EnableAcceptEncodingBrotli": {
+                    "type": "boolean"
+                },
+                "EnableAcceptEncodingGzip": {
+                    "type": "boolean"
+                },
+                "HeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.HeadersConfig"
+                },
+                "QueryStringsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::CachePolicy.QueryStringsConfig"
+                }
+            },
+            "required": [
+                "CookiesConfig",
+                "EnableAcceptEncodingGzip",
+                "HeadersConfig",
+                "QueryStringsConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CachePolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity": {
+            "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": {
+                        "CloudFrontOriginAccessIdentityConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+                        }
+                    },
+                    "required": [
+                        "CloudFrontOriginAccessIdentityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy": {
+            "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": {
+                        "ContinuousDeploymentPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ContinuousDeploymentPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ContinuousDeploymentPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.ContinuousDeploymentPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SingleHeaderPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig"
+                },
+                "SingleWeightPolicyConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig"
+                },
+                "StagingDistributionDnsNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrafficConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "StagingDistributionDnsNames"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTTL": {
+                    "type": "number"
+                },
+                "MaximumTTL": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTTL",
+                "MaximumTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Header": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Header",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SessionStickinessConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SessionStickinessConfig"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ContinuousDeploymentPolicy.TrafficConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SingleHeaderConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleHeaderConfig"
+                },
+                "SingleWeightConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ContinuousDeploymentPolicy.SingleWeightConfig"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution": {
+            "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": {
+                        "DistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution.DistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DistributionConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Distribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CacheBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CachePolicyId": {
+                    "type": "string"
+                },
+                "CachedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Compress": {
+                    "type": "boolean"
+                },
+                "DefaultTTL": {
+                    "type": "number"
+                },
+                "FieldLevelEncryptionId": {
+                    "type": "string"
+                },
+                "ForwardedValues": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ForwardedValues"
+                },
+                "FunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.FunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "LambdaFunctionAssociations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+                    },
+                    "type": "array"
+                },
+                "MaxTTL": {
+                    "type": "number"
+                },
+                "MinTTL": {
+                    "type": "number"
+                },
+                "OriginRequestPolicyId": {
+                    "type": "string"
+                },
+                "PathPattern": {
+                    "type": "string"
+                },
+                "RealtimeLogConfigArn": {
+                    "type": "string"
+                },
+                "ResponseHeadersPolicyId": {
+                    "type": "string"
+                },
+                "SmoothStreaming": {
+                    "type": "boolean"
+                },
+                "TargetOriginId": {
+                    "type": "string"
+                },
+                "TrustedKeyGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TrustedSigners": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ViewerProtocolPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathPattern",
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Cookies": {
+            "additionalProperties": false,
+            "properties": {
+                "Forward": {
+                    "type": "string"
+                },
+                "WhitelistedNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Forward"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomErrorResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorCachingMinTTL": {
+                    "type": "number"
+                },
+                "ErrorCode": {
+                    "type": "number"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponsePagePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ErrorCode"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.CustomOriginConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HTTPPort": {
+                    "type": "number"
+                },
+                "HTTPSPort": {
+                    "type": "number"
                 },
                 "OriginKeepaliveTimeout": {
                     "type": "number"
@@ -33408,9 +37398,21 @@
                         "EnvironmentType": {
                             "type": "string"
                         },
+                        "FleetServiceRole": {
+                            "type": "string"
+                        },
+                        "FleetVpcConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::Fleet.VpcConfig"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "OverflowBehavior": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -33440,6 +37442,27 @@
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodeBuild::Project": {
             "additionalProperties": false,
             "properties": {
@@ -33867,6 +37890,9 @@
                     },
                     "type": "array"
                 },
+                "ScopeConfiguration": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.ScopeConfiguration"
+                },
                 "Webhook": {
                     "type": "boolean"
                 }
@@ -33907,6 +37933,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodeBuild::Project.ScopeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
         "AWS::CodeBuild::Project.Source": {
             "additionalProperties": false,
             "properties": {
@@ -35752,6 +39790,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.BeforeEntryConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35768,6 +39818,21 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Result": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleDeclaration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.EncryptionKey": {
             "additionalProperties": false,
             "properties": {
@@ -35784,6 +39849,21 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.FailureConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                },
+                "Result": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.GitBranchFilterCriteria": {
             "additionalProperties": false,
             "properties": {
@@ -35934,6 +40014,51 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.RuleDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RuleTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.RuleTypeId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.RuleTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.StageDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -35943,6 +40068,9 @@
                     },
                     "type": "array"
                 },
+                "BeforeEntry": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BeforeEntryConditions"
+                },
                 "Blockers": {
                     "items": {
                         "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
@@ -35951,6 +40079,12 @@
                 },
                 "Name": {
                     "type": "string"
+                },
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.FailureConditions"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.SuccessConditions"
                 }
             },
             "required": [
@@ -35975,6 +40109,18 @@
             ],
             "type": "object"
         },
+        "AWS::CodePipeline::Pipeline.SuccessConditions": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.Condition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::CodePipeline::Pipeline.VariableDeclaration": {
             "additionalProperties": false,
             "properties": {
@@ -36665,6 +40811,12 @@
                         "IdentityPoolName": {
                             "type": "string"
                         },
+                        "IdentityPoolTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "OpenIdConnectProviderARNs": {
                             "items": {
                                 "type": "string"
@@ -37057,6 +41209,15 @@
             },
             "type": "object"
         },
+        "AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::LogDeliveryConfiguration.LogConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -37066,8 +41227,23 @@
                 "EventSource": {
                     "type": "string"
                 },
+                "FirehoseConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.FirehoseConfiguration"
+                },
                 "LogLevel": {
                     "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Cognito::LogDeliveryConfiguration.S3Configuration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::LogDeliveryConfiguration.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -37131,6 +41307,12 @@
                         "DeviceConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
                         },
+                        "EmailAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "EmailAuthenticationSubject": {
+                            "type": "string"
+                        },
                         "EmailConfiguration": {
                             "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
                         },
@@ -37250,6 +41432,15 @@
             },
             "type": "object"
         },
+        "AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomAuthMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Cognito::UserPool.CustomEmailSender": {
             "additionalProperties": false,
             "properties": {
@@ -37388,6 +41579,9 @@
                 "MinimumLength": {
                     "type": "number"
                 },
+                "PasswordHistorySize": {
+                    "type": "number"
+                },
                 "RequireLowercase": {
                     "type": "boolean"
                 },
@@ -37511,6 +41705,9 @@
         "AWS::Cognito::UserPool.UserPoolAddOns": {
             "additionalProperties": false,
             "properties": {
+                "AdvancedSecurityAdditionalFlows": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.AdvancedSecurityAdditionalFlows"
+                },
                 "AdvancedSecurityMode": {
                     "type": "string"
                 }
@@ -40263,6 +44460,97 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::AgentStatus": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayOrder": {
+                            "type": "number"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResetOrderNumber": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "State"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::AgentStatus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::ApprovedOrigin": {
             "additionalProperties": false,
             "properties": {
@@ -42149,6 +46437,12 @@
                     },
                     "type": "array"
                 },
+                "SubmitAutoEvaluationActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Connect::Rule.SubmitAutoEvaluationAction"
+                    },
+                    "type": "array"
+                },
                 "TaskActions": {
                     "items": {
                         "$ref": "#/definitions/AWS::Connect::Rule.TaskAction"
@@ -42308,6 +46602,18 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::Rule.SubmitAutoEvaluationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EvaluationFormArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EvaluationFormArn"
+            ],
+            "type": "object"
+        },
         "AWS::Connect::Rule.TaskAction": {
             "additionalProperties": false,
             "properties": {
@@ -43090,6 +47396,185 @@
             ],
             "type": "object"
         },
+        "AWS::Connect::UserHierarchyStructure": {
+            "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": {
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "UserHierarchyStructure": {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.UserHierarchyStructure"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyStructure"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFive": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelFour": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelOne": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelThree": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.LevelTwo": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLevelArn": {
+                    "type": "string"
+                },
+                "HierarchyLevelId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyStructure.UserHierarchyStructure": {
+            "additionalProperties": false,
+            "properties": {
+                "LevelFive": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFive"
+                },
+                "LevelFour": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelFour"
+                },
+                "LevelOne": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelOne"
+                },
+                "LevelThree": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelThree"
+                },
+                "LevelTwo": {
+                    "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure.LevelTwo"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Connect::View": {
             "additionalProperties": false,
             "properties": {
@@ -47265,9 +51750,6 @@
                         "ComputeConfig": {
                             "$ref": "#/definitions/AWS::DMS::ReplicationConfig.ComputeConfig"
                         },
-                        "ReplicationConfigArn": {
-                            "type": "string"
-                        },
                         "ReplicationConfigIdentifier": {
                             "type": "string"
                         },
@@ -47299,6 +51781,14 @@
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "ComputeConfig",
+                        "ReplicationConfigIdentifier",
+                        "ReplicationType",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -47317,7 +51807,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -47416,6 +51907,9 @@
                         "MultiAZ": {
                             "type": "boolean"
                         },
+                        "NetworkType": {
+                            "type": "string"
+                        },
                         "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
@@ -51683,9 +56177,18 @@
                         "DomainIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentAccountIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentAccountRegion": {
+                            "type": "string"
+                        },
                         "EnvironmentProfileIdentifier": {
                             "type": "string"
                         },
+                        "EnvironmentRoleArn": {
+                            "type": "string"
+                        },
                         "GlossaryTerms": {
                             "items": {
                                 "type": "string"
@@ -51707,7 +56210,6 @@
                     },
                     "required": [
                         "DomainIdentifier",
-                        "EnvironmentProfileIdentifier",
                         "Name",
                         "ProjectIdentifier"
                     ],
@@ -51746,6 +56248,95 @@
             },
             "type": "object"
         },
+        "AWS::DataZone::EnvironmentActions": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::EnvironmentActions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::EnvironmentActions.AwsConsoleLinkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::EnvironmentBlueprintConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -51958,6 +56549,78 @@
             },
             "type": "object"
         },
+        "AWS::DataZone::GroupProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "GroupIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::GroupProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::DataZone::Project": {
             "additionalProperties": false,
             "properties": {
@@ -52036,6 +56699,95 @@
             ],
             "type": "object"
         },
+        "AWS::DataZone::ProjectMembership": {
+            "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": {
+                        "Designation": {
+                            "type": "string"
+                        },
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Member": {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership.Member"
+                        },
+                        "ProjectIdentifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Designation",
+                        "DomainIdentifier",
+                        "Member",
+                        "ProjectIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::ProjectMembership"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::ProjectMembership.Member": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupIdentifier": {
+                    "type": "string"
+                },
+                "UserIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DataZone::SubscriptionTarget": {
             "additionalProperties": false,
             "properties": {
@@ -52157,6 +56909,117 @@
             ],
             "type": "object"
         },
+        "AWS::DataZone::UserProfile": {
+            "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": {
+                        "DomainIdentifier": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserIdentifier": {
+                            "type": "string"
+                        },
+                        "UserType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainIdentifier",
+                        "UserIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataZone::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.IamUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.SsoUserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataZone::UserProfile.UserProfileDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.IamUserProfileDetails"
+                },
+                "Sso": {
+                    "$ref": "#/definitions/AWS::DataZone::UserProfile.SsoUserProfileDetails"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Deadline::Farm": {
             "additionalProperties": false,
             "properties": {
@@ -52200,6 +57063,12 @@
                         },
                         "KmsKeyArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -52283,11 +57152,18 @@
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
                         "Configuration",
                         "DisplayName",
+                        "FarmId",
                         "MaxWorkerCount",
                         "RoleArn"
                     ],
@@ -52650,6 +57526,12 @@
                             },
                             "type": "array"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "VpcId": {
                             "type": "string"
                         }
@@ -52717,27 +57599,94 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Family": {
+                        "LicenseEndpointId": {
                             "type": "string"
                         },
-                        "LicenseEndpointId": {
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Deadline::MeteredProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Deadline::Monitor": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
                             "type": "string"
                         },
-                        "Port": {
-                            "type": "number"
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
                         },
-                        "ProductId": {
+                        "IdentityCenterInstanceArn": {
                             "type": "string"
                         },
-                        "Vendor": {
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Subdomain": {
                             "type": "string"
                         }
                     },
+                    "required": [
+                        "DisplayName",
+                        "IdentityCenterInstanceArn",
+                        "RoleArn",
+                        "Subdomain"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Deadline::MeteredProduct"
+                        "AWS::Deadline::Monitor"
                     ],
                     "type": "string"
                 },
@@ -52751,7 +57700,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -52822,10 +57772,17 @@
                         },
                         "RoleArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DisplayName"
+                        "DisplayName",
+                        "FarmId"
                     ],
                     "type": "object"
                 },
@@ -53123,6 +58080,7 @@
                     },
                     "required": [
                         "DisplayName",
+                        "FarmId",
                         "OsFamily"
                     ],
                     "type": "object"
@@ -54542,6 +59500,9 @@
                         "TimeToLiveSpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
                         },
+                        "WriteOnDemandThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                        },
                         "WriteProvisionedThroughputSettings": {
                             "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                         }
@@ -54640,6 +59601,9 @@
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
                 },
+                "WriteOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings"
+                },
                 "WriteProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
                 }
@@ -54729,6 +59693,15 @@
             },
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54750,6 +59723,9 @@
                 "IndexName": {
                     "type": "string"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 }
@@ -54792,6 +59768,9 @@
                 "PointInTimeRecoverySpecification": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
                 },
+                "ReadOnDemandThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadOnDemandThroughputSettings"
+                },
                 "ReadProvisionedThroughputSettings": {
                     "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
                 },
@@ -54909,6 +59888,15 @@
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::GlobalTable.WriteOnDemandThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
             "additionalProperties": false,
             "properties": {
@@ -54992,6 +59980,9 @@
                             },
                             "type": "array"
                         },
+                        "OnDemandThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                        },
                         "PointInTimeRecoverySpecification": {
                             "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
                         },
@@ -55107,6 +60098,9 @@
                     },
                     "type": "array"
                 },
+                "OnDemandThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.OnDemandThroughput"
+                },
                 "Projection": {
                     "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
                 },
@@ -55206,6 +60200,18 @@
             ],
             "type": "object"
         },
+        "AWS::DynamoDB::Table.OnDemandThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxReadRequestUnits": {
+                    "type": "number"
+                },
+                "MaxWriteRequestUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
             "additionalProperties": false,
             "properties": {
@@ -56163,6 +61169,9 @@
                         "BgpAsn": {
                             "type": "number"
                         },
+                        "BgpAsnExtended": {
+                            "type": "number"
+                        },
                         "CertificateArn": {
                             "type": "string"
                         },
@@ -57429,6 +62438,9 @@
                         "Description": {
                             "type": "string"
                         },
+                        "EnablePrivateGua": {
+                            "type": "boolean"
+                        },
                         "OperatingRegions": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
@@ -58509,6 +63521,18 @@
             ],
             "type": "object"
         },
+        "AWS::EC2::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EC2::Instance.Volume": {
             "additionalProperties": false,
             "properties": {
@@ -63185,12 +68209,6 @@
                         "Ipv6CidrBlock": {
                             "type": "string"
                         },
-                        "Ipv6CidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
                         "Ipv6IpamPoolId": {
                             "type": "string"
                         },
@@ -63604,6 +68622,12 @@
                         "SourcePortRange": {
                             "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "TrafficDirection": {
                             "type": "string"
                         },
@@ -63888,6 +68912,9 @@
                         "PropagationDefaultRouteTableId": {
                             "type": "string"
                         },
+                        "SecurityGroupReferencingSupport": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -64565,6 +69592,7 @@
                         }
                     },
                     "required": [
+                        "DestinationCidrBlock",
                         "TransitGatewayRouteTableId"
                     ],
                     "type": "object"
@@ -64907,6 +69935,9 @@
                 },
                 "Ipv6Support": {
                     "type": "string"
+                },
+                "SecurityGroupReferencingSupport": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -65668,6 +70699,24 @@
                         "CustomerGatewayId": {
                             "type": "string"
                         },
+                        "EnableAcceleration": {
+                            "type": "boolean"
+                        },
+                        "LocalIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "LocalIpv6NetworkCidr": {
+                            "type": "string"
+                        },
+                        "OutsideIpAddressType": {
+                            "type": "string"
+                        },
+                        "RemoteIpv4NetworkCidr": {
+                            "type": "string"
+                        },
+                        "RemoteIpv6NetworkCidr": {
+                            "type": "string"
+                        },
                         "StaticRoutesOnly": {
                             "type": "boolean"
                         },
@@ -65680,6 +70729,12 @@
                         "TransitGatewayId": {
                             "type": "string"
                         },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TunnelInsideIpVersion": {
+                            "type": "string"
+                        },
                         "Type": {
                             "type": "string"
                         },
@@ -67221,6 +72276,9 @@
                             },
                             "type": "array"
                         },
+                        "CustomRoleArn": {
+                            "type": "string"
+                        },
                         "Description": {
                             "type": "string"
                         },
@@ -67515,6 +72573,9 @@
             "properties": {
                 "ExecuteCommandConfiguration": {
                     "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                },
+                "ManagedStorageConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ManagedStorageConfiguration"
                 }
             },
             "type": "object"
@@ -67567,113 +72628,125 @@
             },
             "type": "object"
         },
-        "AWS::ECS::Cluster.ServiceConnectDefaults": {
+        "AWS::ECS::Cluster.ManagedStorageConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Namespace": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::ECS::ClusterCapacityProviderAssociations": {
-            "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": {
-                        "CapacityProviders": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Cluster": {
-                            "type": "string"
-                        },
-                        "DefaultCapacityProviderStrategy": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "CapacityProviders",
-                        "Cluster",
-                        "DefaultCapacityProviderStrategy"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::ECS::ClusterCapacityProviderAssociations"
-                    ],
+                "FargateEphemeralStorageKmsKeyId": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "KmsKeyId": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+        "AWS::ECS::Cluster.ServiceConnectDefaults": {
             "additionalProperties": false,
             "properties": {
-                "Base": {
-                    "type": "number"
-                },
-                "CapacityProvider": {
+                "Namespace": {
                     "type": "string"
-                },
-                "Weight": {
-                    "type": "number"
                 }
             },
-            "required": [
-                "CapacityProvider"
-            ],
             "type": "object"
         },
-        "AWS::ECS::PrimaryTaskSet": {
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "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": {
+                        "CapacityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CapacityProviders",
+                        "Cluster",
+                        "DefaultCapacityProviderStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::ClusterCapacityProviderAssociations"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::PrimaryTaskSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -68583,6 +73656,9 @@
                     },
                     "type": "array"
                 },
+                "RestartPolicy": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RestartPolicy"
+                },
                 "Secrets": {
                     "items": {
                         "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
@@ -69019,6 +74095,24 @@
             ],
             "type": "object"
         },
+        "AWS::ECS::TaskDefinition.RestartPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnoredExitCodes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "RestartAttemptPeriod": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ECS::TaskDefinition.RuntimePlatform": {
             "additionalProperties": false,
             "properties": {
@@ -69919,6 +75013,12 @@
                         "ConfigurationValues": {
                             "type": "string"
                         },
+                        "PodIdentityAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Addon.PodIdentityAssociation"
+                            },
+                            "type": "array"
+                        },
                         "PreserveOnDelete": {
                             "type": "boolean"
                         },
@@ -69962,6 +75062,22 @@
             ],
             "type": "object"
         },
+        "AWS::EKS::Addon.PodIdentityAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceAccount"
+            ],
+            "type": "object"
+        },
         "AWS::EKS::Cluster": {
             "additionalProperties": false,
             "properties": {
@@ -70000,6 +75116,9 @@
                         "AccessConfig": {
                             "$ref": "#/definitions/AWS::EKS::Cluster.AccessConfig"
                         },
+                        "BootstrapSelfManagedAddons": {
+                            "type": "boolean"
+                        },
                         "EncryptionConfig": {
                             "items": {
                                 "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
@@ -70030,8 +75149,14 @@
                             },
                             "type": "array"
                         },
+                        "UpgradePolicy": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.UpgradePolicy"
+                        },
                         "Version": {
                             "type": "string"
+                        },
+                        "ZonalShiftConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ZonalShiftConfig"
                         }
                     },
                     "required": [
@@ -70206,6 +75331,24 @@
             ],
             "type": "object"
         },
+        "AWS::EKS::Cluster.UpgradePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "SupportType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ZonalShiftConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EKS::FargateProfile": {
             "additionalProperties": false,
             "properties": {
@@ -71158,6 +76301,9 @@
                 "Name": {
                     "type": "string"
                 },
+                "ResizeSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetResizingSpecifications"
+                },
                 "TargetOnDemandCapacity": {
                     "type": "number"
                 },
@@ -71179,6 +76325,18 @@
             },
             "type": "object"
         },
+        "AWS::EMR::Cluster.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.InstanceGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71243,6 +76401,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71392,11 +76553,29 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71404,6 +76583,21 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.PlacementGroupConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71555,6 +76749,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::Cluster.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::Cluster.StepConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71649,6 +76855,9 @@
                         "Name": {
                             "type": "string"
                         },
+                        "ResizeSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications"
+                        },
                         "TargetOnDemandCapacity": {
                             "type": "number"
                         },
@@ -71749,6 +76958,18 @@
             },
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetResizingSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification"
+                },
+                "SpotResizeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotResizingSpecification"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
             "additionalProperties": false,
             "properties": {
@@ -71773,6 +76994,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "Priority": {
+                    "type": "number"
+                },
                 "WeightedCapacity": {
                     "type": "number"
                 }
@@ -71782,11 +77006,29 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                },
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
                 "AllocationStrategy": {
                     "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
                 }
             },
             "required": [
@@ -71794,6 +77036,21 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.OnDemandResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandCapacityReservationOptions"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -71816,6 +77073,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMR::InstanceFleetConfig.SpotResizingSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
             "additionalProperties": false,
             "properties": {
@@ -72802,6 +78071,9 @@
                             },
                             "type": "array"
                         },
+                        "InteractiveConfiguration": {
+                            "$ref": "#/definitions/AWS::EMRServerless::Application.InteractiveConfiguration"
+                        },
                         "MaximumCapacity": {
                             "$ref": "#/definitions/AWS::EMRServerless::Application.MaximumAllowedResources"
                         },
@@ -72982,6 +78254,18 @@
             ],
             "type": "object"
         },
+        "AWS::EMRServerless::Application.InteractiveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LivyEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "StudioEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::EMRServerless::Application.LogTypeMapKeyValuePair": {
             "additionalProperties": false,
             "properties": {
@@ -73086,6 +78370,9 @@
                 "Disk": {
                     "type": "string"
                 },
+                "DiskType": {
+                    "type": "string"
+                },
                 "Memory": {
                     "type": "string"
                 }
@@ -75267,6 +80554,12 @@
                             },
                             "type": "array"
                         },
+                        "ListenerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute"
+                            },
+                            "type": "array"
+                        },
                         "LoadBalancerArn": {
                             "type": "string"
                         },
@@ -75481,6 +80774,18 @@
             },
             "type": "object"
         },
+        "AWS::ElasticLoadBalancingV2::Listener.ListenerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::ElasticLoadBalancingV2::Listener.MutualAuthentication": {
             "additionalProperties": false,
             "properties": {
@@ -76944,6 +82249,31 @@
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "RecordMatchingModel": {
+                    "type": "string"
+                },
+                "RuleDefinitionType": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "RecordMatchingModel"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdMappingWorkflow.IdMappingTechniques": {
             "additionalProperties": false,
             "properties": {
@@ -76952,6 +82282,9 @@
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.ProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdMappingWorkflow.IdMappingRuleBasedProperties"
                 }
             },
             "type": "object"
@@ -77025,6 +82358,25 @@
             ],
             "type": "object"
         },
+        "AWS::EntityResolution::IdMappingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
         "AWS::EntityResolution::IdNamespace": {
             "additionalProperties": false,
             "properties": {
@@ -77126,6 +82478,9 @@
                 },
                 "ProviderProperties": {
                     "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceProviderProperties"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties"
                 }
             },
             "required": [
@@ -77169,213 +82524,34 @@
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow": {
+        "AWS::EntityResolution::IdNamespace.NamespaceRuleBasedProperties": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "AttributeMatchingModel": {
                     "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
-                            },
-                            "type": "array"
-                        },
-                        "OutputSourceConfig": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
-                            },
-                            "type": "array"
-                        },
-                        "ResolutionTechniques": {
-                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        },
-                        "WorkflowName": {
-                            "type": "string"
-                        }
+                "RecordMatchingModels": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "InputSourceConfig",
-                        "OutputSourceConfig",
-                        "ResolutionTechniques",
-                        "RoleArn",
-                        "WorkflowName"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::EntityResolution::MatchingWorkflow"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "InputSourceARN": {
-                    "type": "string"
-                },
-                "SchemaArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "InputSourceARN",
-                "SchemaArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "IntermediateS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
-            "additionalProperties": false,
-            "properties": {
-                "Hashed": {
-                    "type": "boolean"
-                },
-                "Name": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
-            "additionalProperties": false,
-            "properties": {
-                "ApplyNormalization": {
-                    "type": "boolean"
-                },
-                "KMSArn": {
-                    "type": "string"
+                    "type": "array"
                 },
-                "Output": {
+                "RuleDefinitionTypes": {
                     "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                        "type": "string"
                     },
                     "type": "array"
                 },
-                "OutputS3Path": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Output",
-                "OutputS3Path"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "IntermediateSourceConfiguration": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
-                },
-                "ProviderConfiguration": {
-                    "additionalProperties": true,
-                    "patternProperties": {
-                        "^[a-zA-Z0-9]+$": {
-                            "type": "string"
-                        }
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::IdNamespace.Rule"
                     },
-                    "type": "object"
-                },
-                "ProviderServiceArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "ProviderServiceArn"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
-            "additionalProperties": false,
-            "properties": {
-                "ProviderProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
-                },
-                "ResolutionType": {
-                    "type": "string"
-                },
-                "RuleBasedProperties": {
-                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                    "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+        "AWS::EntityResolution::IdNamespace.Rule": {
             "additionalProperties": false,
             "properties": {
                 "MatchingKeys": {
@@ -77394,26 +82570,269 @@
             ],
             "type": "object"
         },
-        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
-            "additionalProperties": false,
-            "properties": {
-                "AttributeMatchingModel": {
-                    "type": "string"
-                },
-                "Rules": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
-                    },
-                    "type": "array"
-                }
-            },
-            "required": [
-                "AttributeMatchingModel",
-                "Rules"
-            ],
-            "type": "object"
-        },
-        "AWS::EntityResolution::PolicyStatement": {
+        "AWS::EntityResolution::MatchingWorkflow": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IncrementalRunConfig": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig"
+                        },
+                        "InputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.InputSource"
+                            },
+                            "type": "array"
+                        },
+                        "OutputSourceConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputSource"
+                            },
+                            "type": "array"
+                        },
+                        "ResolutionTechniques": {
+                            "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputSourceConfig",
+                        "OutputSourceConfig",
+                        "ResolutionTechniques",
+                        "RoleArn",
+                        "WorkflowName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EntityResolution::MatchingWorkflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IncrementalRunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IncrementalRunType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IncrementalRunType"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.InputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "InputSourceARN": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSourceARN",
+                "SchemaArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Hashed": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.OutputSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplyNormalization": {
+                    "type": "boolean"
+                },
+                "KMSArn": {
+                    "type": "string"
+                },
+                "Output": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.OutputAttribute"
+                    },
+                    "type": "array"
+                },
+                "OutputS3Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Output",
+                "OutputS3Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ProviderProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "IntermediateSourceConfiguration": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.IntermediateSourceConfiguration"
+                },
+                "ProviderConfiguration": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ProviderServiceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderServiceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.ResolutionTechniques": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.ProviderProperties"
+                },
+                "ResolutionType": {
+                    "type": "string"
+                },
+                "RuleBasedProperties": {
+                    "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "MatchingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingKeys",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::MatchingWorkflow.RuleBasedProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeMatchingModel": {
+                    "type": "string"
+                },
+                "MatchPurpose": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EntityResolution::MatchingWorkflow.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AttributeMatchingModel",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EntityResolution::PolicyStatement": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -77590,6 +83009,9 @@
                 "GroupName": {
                     "type": "string"
                 },
+                "Hashed": {
+                    "type": "boolean"
+                },
                 "MatchKey": {
                     "type": "string"
                 },
@@ -78514,9 +83936,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Events::EventBus.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
                         "EventSourceName": {
                             "type": "string"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -78556,6 +83987,15 @@
             ],
             "type": "object"
         },
+        "AWS::Events::EventBus.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Events::EventBusPolicy": {
             "additionalProperties": false,
             "properties": {
@@ -80531,80 +85971,95 @@
             },
             "type": "object"
         },
-        "AWS::FMS::Policy.NetworkFirewallPolicy": {
+        "AWS::FMS::Policy.IcmpTypeCode": {
             "additionalProperties": false,
             "properties": {
-                "FirewallDeploymentModel": {
-                    "type": "string"
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
                 }
             },
             "required": [
-                "FirewallDeploymentModel"
+                "Code",
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyOption": {
+        "AWS::FMS::Policy.NetworkAclCommonPolicy": {
             "additionalProperties": false,
             "properties": {
-                "NetworkFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
-                },
-                "ThirdPartyFirewallPolicy": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                "NetworkAclEntrySet": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntrySet"
                 }
             },
+            "required": [
+                "NetworkAclEntrySet"
+            ],
             "type": "object"
         },
-        "AWS::FMS::Policy.PolicyTag": {
+        "AWS::FMS::Policy.NetworkAclEntry": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
+                "CidrBlock": {
                     "type": "string"
                 },
-                "Value": {
+                "Egress": {
+                    "type": "boolean"
+                },
+                "IcmpTypeCode": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.IcmpTypeCode"
+                },
+                "Ipv6CidrBlock": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::FMS::Policy.ResourceTag": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PortRange"
+                },
+                "Protocol": {
                     "type": "string"
                 },
-                "Value": {
+                "RuleAction": {
                     "type": "string"
                 }
             },
             "required": [
-                "Key"
+                "Egress",
+                "Protocol",
+                "RuleAction"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.SecurityServicePolicyData": {
+        "AWS::FMS::Policy.NetworkAclEntrySet": {
             "additionalProperties": false,
             "properties": {
-                "ManagedServiceData": {
-                    "type": "string"
+                "FirstEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 },
-                "PolicyOption": {
-                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                "ForceRemediateForFirstEntries": {
+                    "type": "boolean"
                 },
-                "Type": {
-                    "type": "string"
+                "ForceRemediateForLastEntries": {
+                    "type": "boolean"
+                },
+                "LastEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclEntry"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Type"
+                "ForceRemediateForFirstEntries",
+                "ForceRemediateForLastEntries"
             ],
             "type": "object"
         },
-        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
+        "AWS::FMS::Policy.NetworkFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
                 "FirewallDeploymentModel": {
@@ -80616,224 +86071,316 @@
             ],
             "type": "object"
         },
-        "AWS::FMS::ResourceSet": {
+        "AWS::FMS::Policy.PolicyOption": {
             "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"
-                        }
-                    ]
+                "NetworkAclCommonPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkAclCommonPolicy"
                 },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "ResourceTypeList": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Resources": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "Name",
-                        "ResourceTypeList"
-                    ],
-                    "type": "object"
+                "NetworkFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.NetworkFirewallPolicy"
                 },
-                "Type": {
-                    "enum": [
-                        "AWS::FMS::ResourceSet"
-                    ],
+                "ThirdPartyFirewallPolicy": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.ThirdPartyFirewallPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "Value": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Key",
+                "Value"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation": {
+        "AWS::FMS::Policy.PortRange": {
             "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": {
-                        "BatchImportMetaDataOnCreate": {
-                            "type": "boolean"
-                        },
-                        "DataRepositoryPath": {
-                            "type": "string"
-                        },
-                        "FileSystemId": {
-                            "type": "string"
-                        },
-                        "FileSystemPath": {
-                            "type": "string"
-                        },
-                        "ImportedFileChunkSize": {
-                            "type": "number"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DataRepositoryPath",
-                        "FileSystemId",
-                        "FileSystemPath"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::FSx::DataRepositoryAssociation"
-                    ],
-                    "type": "string"
+                "From": {
+                    "type": "number"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "To": {
+                    "type": "number"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "From",
+                "To"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+        "AWS::FMS::Policy.ResourceTag": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Key"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+        "AWS::FMS::Policy.SecurityServicePolicyData": {
             "additionalProperties": false,
             "properties": {
-                "Events": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
+                "ManagedServiceData": {
+                    "type": "string"
+                },
+                "PolicyOption": {
+                    "$ref": "#/definitions/AWS::FMS::Policy.PolicyOption"
+                },
+                "Type": {
+                    "type": "string"
                 }
             },
             "required": [
-                "Events"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::FSx::DataRepositoryAssociation.S3": {
+        "AWS::FMS::Policy.ThirdPartyFirewallPolicy": {
             "additionalProperties": false,
             "properties": {
-                "AutoExportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
-                },
-                "AutoImportPolicy": {
-                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                "FirewallDeploymentModel": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "FirewallDeploymentModel"
+            ],
             "type": "object"
         },
-        "AWS::FSx::FileSystem": {
+        "AWS::FMS::ResourceSet": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ResourceTypeList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation": {
+            "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": {
+                        "BatchImportMetaDataOnCreate": {
+                            "type": "boolean"
+                        },
+                        "DataRepositoryPath": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "FileSystemPath": {
+                            "type": "string"
+                        },
+                        "ImportedFileChunkSize": {
+                            "type": "number"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.S3"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataRepositoryPath",
+                        "FileSystemId",
+                        "FileSystemPath"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::DataRepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoExportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.AutoImportPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::DataRepositoryAssociation.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoExportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoExportPolicy"
+                },
+                "AutoImportPolicy": {
+                    "$ref": "#/definitions/AWS::FSx::DataRepositoryAssociation.AutoImportPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -81023,6 +86570,9 @@
                 "ImportedFileChunkSize": {
                     "type": "number"
                 },
+                "MetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.MetadataConfiguration"
+                },
                 "PerUnitStorageThroughput": {
                     "type": "number"
                 },
@@ -81032,6 +86582,18 @@
             },
             "type": "object"
         },
+        "AWS::FSx::FileSystem.MetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::FSx::FileSystem.NfsExports": {
             "additionalProperties": false,
             "properties": {
@@ -84810,6 +90372,9 @@
         "AWS::GlobalAccelerator::CrossAccountAttachment.Resource": {
             "additionalProperties": false,
             "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
                 "EndpointId": {
                     "type": "string"
                 },
@@ -84817,9 +90382,6 @@
                     "type": "string"
                 }
             },
-            "required": [
-                "EndpointId"
-            ],
             "type": "object"
         },
         "AWS::GlobalAccelerator::EndpointGroup": {
@@ -85527,6 +91089,12 @@
                 "ConnectionName": {
                     "type": "string"
                 },
+                "EnableAdditionalMetadata": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "Exclusions": {
                     "items": {
                         "type": "string"
@@ -85977,6 +91545,9 @@
                         },
                         "DatabaseInput": {
                             "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
                         }
                     },
                     "required": [
@@ -86259,9 +91830,18 @@
                         "GlueVersion": {
                             "type": "string"
                         },
+                        "JobMode": {
+                            "type": "string"
+                        },
+                        "JobRunQueuingEnabled": {
+                            "type": "boolean"
+                        },
                         "LogUri": {
                             "type": "string"
                         },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
                         "MaxCapacity": {
                             "type": "number"
                         },
@@ -87887,7 +93467,7 @@
             },
             "type": "object"
         },
-        "AWS::Glue::Workflow": {
+        "AWS::Glue::UsageProfile": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -87922,27 +93502,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DefaultRunProperties": {
-                            "type": "object"
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ProfileConfiguration"
                         },
                         "Description": {
                             "type": "string"
                         },
-                        "MaxConcurrentRuns": {
-                            "type": "number"
-                        },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "type": "object"
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Glue::Workflow"
+                        "AWS::Glue::UsageProfile"
                     ],
                     "type": "string"
                 },
@@ -87956,11 +93539,130 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Grafana::Workspace": {
+        "AWS::Glue::UsageProfile.ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::UsageProfile.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JobConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SessionConfiguration": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile.ConfigurationObject"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "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": {
+                        "DefaultRunProperties": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentRuns": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Grafana::Workspace": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91731,7 +97433,9 @@
                         }
                     },
                     "required": [
-                        "FindingCriteria"
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name"
                     ],
                     "type": "object"
                 },
@@ -91941,7 +97645,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Master": {
+        "AWS::GuardDuty::MalwareProtectionPlan": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -91976,25 +97680,31 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DetectorId": {
-                            "type": "string"
+                        "Actions": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNActions"
                         },
-                        "InvitationId": {
-                            "type": "string"
+                        "ProtectedResource": {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource"
                         },
-                        "MasterId": {
+                        "Role": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.TagItem"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
-                        "DetectorId",
-                        "MasterId"
+                        "ProtectedResource",
+                        "Role"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Master"
+                        "AWS::GuardDuty::MalwareProtectionPlan"
                     ],
                     "type": "string"
                 },
@@ -92013,7 +97723,80 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::Member": {
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNActions": {
+            "additionalProperties": false,
+            "properties": {
+                "Tagging": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.CFNTagging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNProtectedResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan.S3Bucket"
+                }
+            },
+            "required": [
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNStatusReasons": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.CFNTagging": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.S3Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "ObjectPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::MalwareProtectionPlan.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92051,30 +97834,22 @@
                         "DetectorId": {
                             "type": "string"
                         },
-                        "DisableEmailNotification": {
-                            "type": "boolean"
-                        },
-                        "Email": {
-                            "type": "string"
-                        },
-                        "MemberId": {
-                            "type": "string"
-                        },
-                        "Message": {
+                        "InvitationId": {
                             "type": "string"
                         },
-                        "Status": {
+                        "MasterId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "Email"
+                        "DetectorId",
+                        "MasterId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::Member"
+                        "AWS::GuardDuty::Master"
                     ],
                     "type": "string"
                 },
@@ -92093,7 +97868,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet": {
+        "AWS::GuardDuty::Member": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92128,37 +97903,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Activate": {
-                            "type": "boolean"
-                        },
                         "DetectorId": {
                             "type": "string"
                         },
-                        "Format": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
                             "type": "string"
                         },
-                        "Location": {
+                        "MemberId": {
                             "type": "string"
                         },
-                        "Name": {
+                        "Message": {
                             "type": "string"
                         },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
-                            },
-                            "type": "array"
+                        "Status": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "Format",
-                        "Location"
+                        "Email"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::GuardDuty::ThreatIntelSet"
+                        "AWS::GuardDuty::Member"
                     ],
                     "type": "string"
                 },
@@ -92177,23 +97948,7 @@
             ],
             "type": "object"
         },
-        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
-            "additionalProperties": false,
-            "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Key",
-                "Value"
-            ],
-            "type": "object"
-        },
-        "AWS::HealthImaging::Datastore": {
+        "AWS::GuardDuty::ThreatIntelSet": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92228,27 +97983,37 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DatastoreName": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
                             "type": "string"
                         },
-                        "KmsKeyArn": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
                             "type": "string"
                         },
                         "Tags": {
-                            "additionalProperties": true,
-                            "patternProperties": {
-                                "^[a-zA-Z0-9]+$": {
-                                    "type": "string"
-                                }
+                            "items": {
+                                "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet.TagItem"
                             },
-                            "type": "object"
+                            "type": "array"
                         }
                     },
+                    "required": [
+                        "Format",
+                        "Location"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::HealthImaging::Datastore"
+                        "AWS::GuardDuty::ThreatIntelSet"
                     ],
                     "type": "string"
                 },
@@ -92262,11 +98027,101 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::HealthLake::FHIRDatastore": {
+        "AWS::GuardDuty::ThreatIntelSet.TagItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthImaging::Datastore": {
+            "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": {
+                        "DatastoreName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthImaging::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -92883,9 +98738,6 @@
                             "type": "string"
                         }
                     },
-                    "required": [
-                        "ThumbprintList"
-                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -92904,8 +98756,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -94081,7 +99932,7 @@
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration": {
+        "AWS::IVS::PublicKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94116,36 +99967,24 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DestinationConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
-                        },
                         "Name": {
                             "type": "string"
                         },
-                        "RecordingReconnectWindowSeconds": {
-                            "type": "number"
-                        },
-                        "RenditionConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        "PublicKeyMaterial": {
+                            "type": "string"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "ThumbnailConfiguration": {
-                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
-                    "required": [
-                        "DestinationConfiguration"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::RecordingConfiguration"
+                        "AWS::IVS::PublicKey"
                     ],
                     "type": "string"
                 },
@@ -94159,69 +99998,11 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "S3": {
-                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RenditionSelection": {
-                    "type": "string"
-                },
-                "Renditions": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "BucketName": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "BucketName"
+                "Type"
             ],
             "type": "object"
         },
-        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "RecordingMode": {
-                    "type": "string"
-                },
-                "Resolution": {
-                    "type": "string"
-                },
-                "Storage": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "TargetIntervalSeconds": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::IVS::Stage": {
+        "AWS::IVS::RecordingConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -94256,21 +100037,36 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
+                        "RecordingReconnectWindowSeconds": {
+                            "type": "number"
+                        },
+                        "RenditionConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.RenditionConfiguration"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "ThumbnailConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.ThumbnailConfiguration"
                         }
                     },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::IVS::Stage"
+                        "AWS::IVS::RecordingConfiguration"
                     ],
                     "type": "string"
                 },
@@ -94284,85 +100080,36 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.RenditionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RenditionSelection": {
                     "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": {
-                        "Name": {
-                            "type": "string"
-                        },
-                        "S3": {
-                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "Renditions": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "S3"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::IVS::StorageConfiguration"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 }
             },
-            "required": [
-                "Type",
-                "Properties"
-            ],
             "type": "object"
         },
-        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "BucketName": {
@@ -94374,7 +100121,202 @@
             ],
             "type": "object"
         },
-        "AWS::IVS::StreamKey": {
+        "AWS::IVS::RecordingConfiguration.ThumbnailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordingMode": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                },
+                "Storage": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetIntervalSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IVS::Stage": {
+            "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": {
+                        "AutoParticipantRecordingConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::Stage.AutoParticipantRecordingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Stage.AutoParticipantRecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MediaTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StorageConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3": {
+                            "$ref": "#/definitions/AWS::IVS::StorageConfiguration.S3StorageConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StorageConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StorageConfiguration.S3StorageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -96809,6 +102751,12 @@
                             "$ref": "#/definitions/AWS::InspectorV2::CisScanConfiguration.CisTargets"
                         }
                     },
+                    "required": [
+                        "ScanName",
+                        "Schedule",
+                        "SecurityLevel",
+                        "Targets"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -96827,7 +102775,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -98490,9 +104439,18 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "ApplicationProtocol": {
+                            "type": "string"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
                         "AuthorizerConfig": {
                             "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
                         },
+                        "ClientCertificateConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.ClientCertificateConfig"
+                        },
                         "DomainConfigurationName": {
                             "type": "string"
                         },
@@ -98561,6 +104519,15 @@
             },
             "type": "object"
         },
+        "AWS::IoT::DomainConfiguration.ClientCertificateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientCertificateCallbackArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::IoT::DomainConfiguration.ServerCertificateConfig": {
             "additionalProperties": false,
             "properties": {
@@ -104016,6 +109983,12 @@
                             },
                             "type": "array"
                         },
+                        "SignalsToFetch": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchInformation"
+                            },
+                            "type": "array"
+                        },
                         "SpoolingMode": {
                             "type": "string"
                         },
@@ -104033,7 +110006,6 @@
                         }
                     },
                     "required": [
-                        "Action",
                         "CollectionScheme",
                         "Name",
                         "SignalCatalogArn",
@@ -104095,9 +110067,28 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                },
+                "TriggerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression",
+                "TriggerMode"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.DataDestinationConfig": {
             "additionalProperties": false,
             "properties": {
+                "MqttTopicConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.MqttTopicConfig"
+                },
                 "S3Config": {
                     "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.S3Config"
                 },
@@ -104107,6 +110098,22 @@
             },
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.MqttTopicConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "MqttTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "MqttTopicArn"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.S3Config": {
             "additionalProperties": false,
             "properties": {
@@ -104128,6 +110135,44 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.SignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.ConditionBasedSignalFetchConfig"
+                },
+                "TimeBased": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTFleetWise::Campaign.SignalFetchInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConditionLanguageVersion": {
+                    "type": "number"
+                },
+                "FullyQualifiedName": {
+                    "type": "string"
+                },
+                "SignalFetchConfig": {
+                    "$ref": "#/definitions/AWS::IoTFleetWise::Campaign.SignalFetchConfig"
+                }
+            },
+            "required": [
+                "Actions",
+                "FullyQualifiedName",
+                "SignalFetchConfig"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.SignalInformation": {
             "additionalProperties": false,
             "properties": {
@@ -104158,6 +110203,18 @@
             ],
             "type": "object"
         },
+        "AWS::IoTFleetWise::Campaign.TimeBasedSignalFetchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionFrequencyMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutionFrequencyMs"
+            ],
+            "type": "object"
+        },
         "AWS::IoTFleetWise::Campaign.TimestreamConfig": {
             "additionalProperties": false,
             "properties": {
@@ -111035,6 +117092,75 @@
             ],
             "type": "object"
         },
+        "AWS::Kinesis::ResourcePolicy": {
+            "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": {
+                        "ResourceArn": {
+                            "type": "string"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "ResourcePolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::Kinesis::Stream": {
             "additionalProperties": false,
             "properties": {
@@ -111949,6 +118075,9 @@
                 "ApplicationSnapshotConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
                 },
+                "ApplicationSystemRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration"
+                },
                 "EnvironmentProperties": {
                     "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
                 },
@@ -112009,6 +118138,18 @@
             ],
             "type": "object"
         },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSystemRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RollbackEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "RollbackEnabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
             "additionalProperties": false,
             "properties": {
@@ -112971,6 +119112,9 @@
                         "HttpEndpointDestinationConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
                         },
+                        "IcebergDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration"
+                        },
                         "KinesisStreamSourceConfiguration": {
                             "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
                         },
@@ -113182,6 +119326,15 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113260,6 +119413,31 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDatabaseName": {
+                    "type": "string"
+                },
+                "DestinationTableName": {
+                    "type": "string"
+                },
+                "S3ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "UniqueKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DestinationDatabaseName",
+                "DestinationTableName"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.DocumentIdOptions": {
             "additionalProperties": false,
             "properties": {
@@ -113500,6 +119678,9 @@
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
@@ -113523,6 +119704,47 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.IcebergDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CatalogConfiguration"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "DestinationTableConfigurationList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DestinationTableConfiguration"
+                    },
+                    "type": "array"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "s3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CatalogConfiguration",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -113569,6 +119791,9 @@
                 "MSKClusterARN": {
                     "type": "string"
                 },
+                "ReadFromTimestamp": {
+                    "type": "string"
+                },
                 "TopicName": {
                     "type": "string"
                 }
@@ -113755,6 +119980,9 @@
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "Username": {
                     "type": "string"
                 }
@@ -113762,10 +119990,8 @@
             "required": [
                 "ClusterJDBCURL",
                 "CopyCommand",
-                "Password",
                 "RoleARN",
-                "S3Configuration",
-                "Username"
+                "S3Configuration"
             ],
             "type": "object"
         },
@@ -113845,6 +120071,24 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecretARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.Serializer": {
             "additionalProperties": false,
             "properties": {
@@ -113857,12 +120101,27 @@
             },
             "type": "object"
         },
+        "AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::KinesisFirehose::DeliveryStream.SnowflakeDestinationConfiguration": {
             "additionalProperties": false,
             "properties": {
                 "AccountUrl": {
                     "type": "string"
                 },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeBufferingHints"
+                },
                 "CloudWatchLoggingOptions": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
                 },
@@ -113902,6 +120161,9 @@
                 "Schema": {
                     "type": "string"
                 },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
+                },
                 "SnowflakeRoleConfiguration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SnowflakeRoleConfiguration"
                 },
@@ -113918,12 +120180,10 @@
             "required": [
                 "AccountUrl",
                 "Database",
-                "PrivateKey",
                 "RoleARN",
                 "S3Configuration",
                 "Schema",
-                "Table",
-                "User"
+                "Table"
             ],
             "type": "object"
         },
@@ -114004,12 +120264,14 @@
                 },
                 "S3Configuration": {
                     "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "SecretsManagerConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SecretsManagerConfiguration"
                 }
             },
             "required": [
                 "HECEndpoint",
                 "HECEndpointType",
-                "HECToken",
                 "S3Configuration"
             ],
             "type": "object"
@@ -115378,9 +121640,6 @@
                     "type": "array"
                 }
             },
-            "required": [
-                "AdditionalVersionWeights"
-            ],
             "type": "object"
         },
         "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
@@ -115454,6 +121713,12 @@
                         },
                         "Description": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -115691,6 +121956,9 @@
                             },
                             "type": "array"
                         },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
                         "MaximumBatchingWindowInSeconds": {
                             "type": "number"
                         },
@@ -115730,6 +121998,12 @@
                         "StartingPositionTimestamp": {
                             "type": "number"
                         },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "Topics": {
                             "items": {
                                 "type": "string"
@@ -115972,6 +122246,9 @@
                         "PackageType": {
                             "type": "string"
                         },
+                        "RecursiveLoop": {
+                            "type": "string"
+                        },
                         "ReservedConcurrentExecutions": {
                             "type": "number"
                         },
@@ -116045,6 +122322,9 @@
                 "S3ObjectVersion": {
                     "type": "string"
                 },
+                "SourceKMSKeyArn": {
+                    "type": "string"
+                },
                 "ZipFile": {
                     "type": "string"
                 }
@@ -116638,6 +122918,9 @@
                         "FunctionName": {
                             "type": "string"
                         },
+                        "Policy": {
+                            "type": "object"
+                        },
                         "ProvisionedConcurrencyConfig": {
                             "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
                         },
@@ -116698,6 +122981,110 @@
             ],
             "type": "object"
         },
+        "AWS::LaunchWizard::Deployment": {
+            "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": {
+                        "DeploymentPatternName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Specifications": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LaunchWizard::Deployment.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "WorkloadName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeploymentPatternName",
+                        "Name",
+                        "Specifications",
+                        "WorkloadName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LaunchWizard::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LaunchWizard::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
         "AWS::Lex::Bot": {
             "additionalProperties": false,
             "properties": {
@@ -124203,6 +130590,15 @@
             },
             "type": "object"
         },
+        "AWS::MSK::Replicator.ReplicationTopicNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MSK::Replicator.TopicReplication": {
             "additionalProperties": false,
             "properties": {
@@ -124218,6 +130614,9 @@
                 "StartingPosition": {
                     "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationStartingPosition"
                 },
+                "TopicNameConfiguration": {
+                    "$ref": "#/definitions/AWS::MSK::Replicator.ReplicationTopicNameConfiguration"
+                },
                 "TopicsToExclude": {
                     "items": {
                         "type": "string"
@@ -124533,9 +130932,15 @@
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
                         },
+                        "MaxWebservers": {
+                            "type": "number"
+                        },
                         "MaxWorkers": {
                             "type": "number"
                         },
+                        "MinWebservers": {
+                            "type": "number"
+                        },
                         "MinWorkers": {
                             "type": "number"
                         },
@@ -125922,6 +132327,15 @@
                         "AvailabilityZone": {
                             "type": "string"
                         },
+                        "Maintenance": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Maintenance"
+                        },
+                        "MediaStreams": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStream"
+                            },
+                            "type": "array"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -125930,6 +132344,15 @@
                         },
                         "SourceFailoverConfig": {
                             "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        },
+                        "SourceMonitoringConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.SourceMonitoringConfig"
+                        },
+                        "VpcInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::Flow.VpcInterface"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -126013,6 +132436,33 @@
             },
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.Fmtp": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelOrder": {
+                    "type": "string"
+                },
+                "Colorimetry": {
+                    "type": "string"
+                },
+                "ExactFramerate": {
+                    "type": "string"
+                },
+                "Par": {
+                    "type": "string"
+                },
+                "Range": {
+                    "type": "string"
+                },
+                "ScanMode": {
+                    "type": "string"
+                },
+                "Tcs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.GatewayBridgeSource": {
             "additionalProperties": false,
             "properties": {
@@ -126028,6 +132478,119 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::Flow.InputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Interface"
+                }
+            },
+            "required": [
+                "InputPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Maintenance": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceDay": {
+                    "type": "string"
+                },
+                "MaintenanceStartHour": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaintenanceDay",
+                "MaintenanceStartHour"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStream": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamAttributes"
+                },
+                "ClockRate": {
+                    "type": "number"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Fmt": {
+                    "type": "number"
+                },
+                "MediaStreamId": {
+                    "type": "number"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                },
+                "MediaStreamType": {
+                    "type": "string"
+                },
+                "VideoFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MediaStreamId",
+                "MediaStreamName",
+                "MediaStreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Fmtp": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Fmtp"
+                },
+                "Lang": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.MediaStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingName": {
+                    "type": "string"
+                },
+                "InputConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.InputConfiguration"
+                    },
+                    "type": "array"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::Flow.Source": {
             "additionalProperties": false,
             "properties": {
@@ -126055,6 +132618,15 @@
                 "MaxLatency": {
                     "type": "number"
                 },
+                "MaxSyncBuffer": {
+                    "type": "number"
+                },
+                "MediaStreamSourceConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::Flow.MediaStreamSourceConfiguration"
+                    },
+                    "type": "array"
+                },
                 "MinLatency": {
                     "type": "number"
                 },
@@ -126094,154 +132666,202 @@
             },
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.SourcePriority": {
+        "AWS::MediaConnect::Flow.SourceMonitoringConfig": {
             "additionalProperties": false,
             "properties": {
-                "PrimarySource": {
+                "ThumbnailState": {
                     "type": "string"
                 }
             },
             "required": [
-                "PrimarySource"
+                "ThumbnailState"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
+        "AWS::MediaConnect::Flow.SourcePriority": {
             "additionalProperties": false,
             "properties": {
-                "VpcInterfaceName": {
+                "PrimarySource": {
                     "type": "string"
                 }
             },
+            "required": [
+                "PrimarySource"
+            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement": {
+        "AWS::MediaConnect::Flow.VpcInterface": {
             "additionalProperties": false,
             "properties": {
-                "Condition": {
+                "Name": {
                     "type": "string"
                 },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
+                "NetworkInterfaceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
-                            "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
-                    ]
+                "NetworkInterfaceType": {
+                    "type": "string"
                 },
-                "Metadata": {
-                    "type": "object"
+                "RoleArn": {
+                    "type": "string"
                 },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "DataTransferSubscriberFeePercent": {
-                            "type": "number"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Encryption": {
-                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
-                        },
-                        "EntitlementStatus": {
-                            "type": "string"
-                        },
-                        "FlowArn": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Subscribers": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        }
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "Description",
-                        "FlowArn",
-                        "Name",
-                        "Subscribers"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::MediaConnect::FlowEntitlement"
-                    ],
-                    "type": "string"
+                    "type": "array"
                 },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
+                "SubnetId": {
                     "type": "string"
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Name",
+                "RoleArn",
+                "SecurityGroupIds",
+                "SubnetId"
             ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+        "AWS::MediaConnect::Flow.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
-                "Algorithm": {
-                    "type": "string"
-                },
-                "ConstantInitializationVector": {
-                    "type": "string"
-                },
-                "DeviceId": {
-                    "type": "string"
-                },
-                "KeyType": {
-                    "type": "string"
-                },
-                "Region": {
-                    "type": "string"
-                },
-                "ResourceId": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                },
-                "SecretArn": {
-                    "type": "string"
-                },
-                "Url": {
+                "VpcInterfaceName": {
                     "type": "string"
                 }
             },
-            "required": [
-                "Algorithm",
-                "RoleArn"
-            ],
             "type": "object"
         },
-        "AWS::MediaConnect::FlowOutput": {
+        "AWS::MediaConnect::FlowEntitlement": {
+            "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": {
+                        "DataTransferSubscriberFeePercent": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement.Encryption"
+                        },
+                        "EntitlementStatus": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "FlowArn",
+                        "Name",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowEntitlement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "DeviceId": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Algorithm",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -126297,12 +132917,21 @@
                         "MaxLatency": {
                             "type": "number"
                         },
+                        "MediaStreamOutputConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "MinLatency": {
                             "type": "number"
                         },
                         "Name": {
                             "type": "string"
                         },
+                        "OutputStatus": {
+                            "type": "string"
+                        },
                         "Port": {
                             "type": "number"
                         },
@@ -126349,6 +132978,41 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationIp": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "number"
+                },
+                "Interface": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Interface"
+                }
+            },
+            "required": [
+                "DestinationIp",
+                "DestinationPort",
+                "Interface"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.EncodingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFactor": {
+                    "type": "number"
+                },
+                "EncoderProfile": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionFactor"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -126371,6 +133035,43 @@
             ],
             "type": "object"
         },
+        "AWS::MediaConnect::FlowOutput.Interface": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.MediaStreamOutputConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.DestinationConfiguration"
+                    },
+                    "type": "array"
+                },
+                "EncodingName": {
+                    "type": "string"
+                },
+                "EncodingParameters": {
+                    "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.EncodingParameters"
+                },
+                "MediaStreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncodingName",
+                "MediaStreamName"
+            ],
+            "type": "object"
+        },
         "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
             "additionalProperties": false,
             "properties": {
@@ -127528,6 +134229,9 @@
             "properties": {
                 "AvailSettings": {
                     "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                },
+                "Scte35SegmentationScope": {
+                    "type": "string"
                 }
             },
             "type": "object"
@@ -128454,6 +135158,9 @@
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "NumRefFrames": {
                     "type": "number"
                 },
@@ -128601,6 +135308,9 @@
                 "MinIInterval": {
                     "type": "number"
                 },
+                "MinQp": {
+                    "type": "number"
+                },
                 "MvOverPictureBoundaries": {
                     "type": "string"
                 },
@@ -130310,7 +137020,7 @@
             },
             "type": "object"
         },
-        "AWS::MediaLive::Input": {
+        "AWS::MediaLive::ChannelPlacementGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130345,57 +137055,30 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
-                            },
-                            "type": "array"
+                        "ClusterId": {
+                            "type": "string"
                         },
-                        "InputDevices": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
-                            },
-                            "type": "array"
+                        "Name": {
+                            "type": "string"
                         },
-                        "InputSecurityGroups": {
+                        "Nodes": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "MediaConnectFlows": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "RoleArn": {
-                            "type": "string"
-                        },
-                        "Sources": {
+                        "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                                "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup.Tags"
                             },
                             "type": "array"
-                        },
-                        "Tags": {
-                            "type": "object"
-                        },
-                        "Type": {
-                            "type": "string"
-                        },
-                        "Vpc": {
-                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
                         }
                     },
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Input"
+                        "AWS::MediaLive::ChannelPlacementGroup"
                     ],
                     "type": "string"
                 },
@@ -130413,76 +137096,727 @@
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Input.InputDestinationRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "StreamName": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputDeviceSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "Id": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputSourceRequest": {
+        "AWS::MediaLive::ChannelPlacementGroup.Tags": {
             "additionalProperties": false,
             "properties": {
-                "PasswordParam": {
-                    "type": "string"
-                },
-                "Url": {
+                "Key": {
                     "type": "string"
                 },
-                "Username": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.InputVpcRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "SecurityGroupIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                },
-                "SubnetIds": {
-                    "items": {
-                        "type": "string"
-                    },
-                    "type": "array"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
-            "additionalProperties": false,
-            "properties": {
-                "FlowArn": {
+                "Value": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::InputSecurityGroup": {
+        "AWS::MediaLive::CloudWatchAlarmTemplate": {
+            "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": {
+                        "ComparisonOperator": {
+                            "type": "string"
+                        },
+                        "DatapointsToAlarm": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EvaluationPeriods": {
+                            "type": "number"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "Statistic": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetResourceType": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods",
+                        "GroupIdentifier",
+                        "MetricName",
+                        "Name",
+                        "Period",
+                        "Statistic",
+                        "TargetResourceType",
+                        "Threshold",
+                        "TreatMissingData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::CloudWatchAlarmTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster": {
+            "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": {
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster.ClusterNetworkSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Cluster.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.ClusterNetworkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRoute": {
+                    "type": "string"
+                },
+                "InterfaceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Cluster.InterfaceMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.InterfaceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalInterfaceName": {
+                    "type": "string"
+                },
+                "NetworkId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Cluster.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventTargets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget"
+                            },
+                            "type": "array"
+                        },
+                        "EventType": {
+                            "type": "string"
+                        },
+                        "GroupIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "EventType",
+                        "GroupIdentifier",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplate.EventBridgeRuleTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::EventBridgeRuleTemplateGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "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": {
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDestinationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "InputDevices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputDeviceSettings"
+                            },
+                            "type": "array"
+                        },
+                        "InputSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MediaConnectFlows": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.MediaConnectFlowRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Input.InputSourceRequest"
+                            },
+                            "type": "array"
+                        },
+                        "SrtSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.SrtSettingsRequest"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Input.InputVpcRequest"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDestinationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputDeviceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.InputVpcRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.MediaConnectFlowRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerDecryptionRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "PassphraseSecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtCallerSourceRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerDecryptionRequest"
+                },
+                "MinimumLatency": {
+                    "type": "number"
+                },
+                "SrtListenerAddress": {
+                    "type": "string"
+                },
+                "SrtListenerPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input.SrtSettingsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SrtCallerSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Input.SrtCallerSourceRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130593,41 +137927,500 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Destinations": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
-                            },
-                            "type": "array"
-                        },
-                        "MultiplexSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexOutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "MultiplexSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexSettings"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZones",
+                        "MultiplexSettings",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntitlementArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexMediaConnectOutputDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.MultiplexSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumVideoBufferDelayMilliseconds": {
+                    "type": "number"
+                },
+                "TransportStreamBitrate": {
+                    "type": "number"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "TransportStreamReservedBitrate": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TransportStreamBitrate",
+                "TransportStreamId"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplex.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram": {
+            "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": {
+                        "MultiplexId": {
+                            "type": "string"
+                        },
+                        "MultiplexProgramSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
+                        },
+                        "PacketIdentifiersMap": {
+                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        },
+                        "PipelineDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredChannelPipeline": {
+                            "type": "string"
+                        },
+                        "ProgramName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Multiplexprogram"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbSubPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "DvbTeletextPid": {
+                    "type": "number"
+                },
+                "EtvPlatformPid": {
+                    "type": "number"
+                },
+                "EtvSignalPid": {
+                    "type": "number"
+                },
+                "KlvDataPids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "PcrPid": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "number"
+                },
+                "PrivateMetadataPid": {
+                    "type": "number"
+                },
+                "Scte27Pids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Scte35Pid": {
+                    "type": "number"
+                },
+                "TimedMetadataPid": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveChannelPipeline": {
+                    "type": "string"
+                },
+                "PipelineId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ProviderName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PreferredChannelPipeline": {
+                    "type": "string"
+                },
+                "ProgramNumber": {
+                    "type": "number"
+                },
+                "ServiceDescriptor": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
+                },
+                "VideoSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                }
+            },
+            "required": [
+                "ProgramNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumBitrate": {
+                    "type": "number"
+                },
+                "MinimumBitrate": {
+                    "type": "number"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantBitrate": {
+                    "type": "number"
+                },
+                "StatmuxSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network": {
+            "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": {
+                        "IpPools": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.IpPool"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Routes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Route"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Network.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpPools",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Network"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.IpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Route": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Gateway": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Network.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::SdiSource": {
+            "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": {
+                        "Mode": {
+                            "type": "string"
                         },
                         "Name": {
                             "type": "string"
                         },
                         "Tags": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplex.Tags"
+                                "$ref": "#/definitions/AWS::MediaLive::SdiSource.Tags"
                             },
                             "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "AvailabilityZones",
-                        "MultiplexSettings",
-                        "Name"
+                        "Name",
+                        "Type"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplex"
+                        "AWS::MediaLive::SdiSource"
                     ],
                     "type": "string"
                 },
@@ -130646,47 +138439,7 @@
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "EntitlementArn": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexOutputDestination": {
-            "additionalProperties": false,
-            "properties": {
-                "MultiplexMediaConnectOutputDestinationSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplex.MultiplexMediaConnectOutputDestinationSettings"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.MultiplexSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumVideoBufferDelayMilliseconds": {
-                    "type": "number"
-                },
-                "TransportStreamBitrate": {
-                    "type": "number"
-                },
-                "TransportStreamId": {
-                    "type": "number"
-                },
-                "TransportStreamReservedBitrate": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "TransportStreamBitrate",
-                "TransportStreamId"
-            ],
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplex.Tags": {
+        "AWS::MediaLive::SdiSource.Tags": {
             "additionalProperties": false,
             "properties": {
                 "Key": {
@@ -130698,7 +138451,7 @@
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram": {
+        "AWS::MediaLive::SignalMap": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -130733,36 +138486,49 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ChannelId": {
-                            "type": "string"
+                        "CloudWatchAlarmTemplateGroupIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
                         },
-                        "MultiplexId": {
+                        "Description": {
                             "type": "string"
                         },
-                        "MultiplexProgramSettings": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings"
-                        },
-                        "PacketIdentifiersMap": {
-                            "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap"
+                        "DiscoveryEntryPointArn": {
+                            "type": "string"
                         },
-                        "PipelineDetails": {
+                        "EventBridgeRuleTemplateGroupIdentifiers": {
                             "items": {
-                                "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail"
+                                "type": "string"
                             },
                             "type": "array"
                         },
-                        "PreferredChannelPipeline": {
-                            "type": "string"
+                        "ForceRediscovery": {
+                            "type": "boolean"
                         },
-                        "ProgramName": {
+                        "Name": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
                         }
                     },
+                    "required": [
+                        "DiscoveryEntryPointArn",
+                        "Name"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::MediaLive::Multiplexprogram"
+                        "AWS::MediaLive::SignalMap"
                     ],
                     "type": "string"
                 },
@@ -130776,143 +138542,81 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPacketIdentifiersMap": {
+        "AWS::MediaLive::SignalMap.MediaResource": {
             "additionalProperties": false,
             "properties": {
-                "AudioPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbSubPids": {
-                    "items": {
-                        "type": "number"
-                    },
-                    "type": "array"
-                },
-                "DvbTeletextPid": {
-                    "type": "number"
-                },
-                "EtvPlatformPid": {
-                    "type": "number"
-                },
-                "EtvSignalPid": {
-                    "type": "number"
-                },
-                "KlvDataPids": {
+                "Destinations": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
                 },
-                "PcrPid": {
-                    "type": "number"
-                },
-                "PmtPid": {
-                    "type": "number"
-                },
-                "PrivateMetadataPid": {
-                    "type": "number"
+                "Name": {
+                    "type": "string"
                 },
-                "Scte27Pids": {
+                "Sources": {
                     "items": {
-                        "type": "number"
+                        "$ref": "#/definitions/AWS::MediaLive::SignalMap.MediaResourceNeighbor"
                     },
                     "type": "array"
-                },
-                "Scte35Pid": {
-                    "type": "number"
-                },
-                "TimedMetadataPid": {
-                    "type": "number"
-                },
-                "VideoPid": {
-                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramPipelineDetail": {
+        "AWS::MediaLive::SignalMap.MediaResourceNeighbor": {
             "additionalProperties": false,
             "properties": {
-                "ActiveChannelPipeline": {
+                "Arn": {
                     "type": "string"
                 },
-                "PipelineId": {
+                "Name": {
                     "type": "string"
                 }
             },
+            "required": [
+                "Arn"
+            ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor": {
+        "AWS::MediaLive::SignalMap.MonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "ProviderName": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ServiceName": {
+                "ErrorMessage": {
+                    "type": "string"
+                },
+                "Status": {
                     "type": "string"
                 }
             },
             "required": [
-                "ProviderName",
-                "ServiceName"
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexProgramSettings": {
+        "AWS::MediaLive::SignalMap.SuccessfulMonitorDeployment": {
             "additionalProperties": false,
             "properties": {
-                "PreferredChannelPipeline": {
+                "DetailsUri": {
                     "type": "string"
                 },
-                "ProgramNumber": {
-                    "type": "number"
-                },
-                "ServiceDescriptor": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexProgramServiceDescriptor"
-                },
-                "VideoSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings"
+                "Status": {
+                    "type": "string"
                 }
             },
             "required": [
-                "ProgramNumber"
+                "DetailsUri",
+                "Status"
             ],
             "type": "object"
         },
-        "AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "MaximumBitrate": {
-                    "type": "number"
-                },
-                "MinimumBitrate": {
-                    "type": "number"
-                },
-                "Priority": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::MediaLive::Multiplexprogram.MultiplexVideoSettings": {
-            "additionalProperties": false,
-            "properties": {
-                "ConstantBitrate": {
-                    "type": "number"
-                },
-                "StatmuxSettings": {
-                    "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram.MultiplexStatmuxVideoSettings"
-                }
-            },
-            "type": "object"
-        },
         "AWS::MediaPackage::Asset": {
             "additionalProperties": false,
             "properties": {
@@ -132102,6 +139806,9 @@
                         "Description": {
                             "type": "string"
                         },
+                        "InputType": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -132339,9 +140046,18 @@
                         "ContainerType": {
                             "type": "string"
                         },
+                        "DashManifests": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration"
+                            },
+                            "type": "array"
+                        },
                         "Description": {
                             "type": "string"
                         },
+                        "ForceEndpointErrorConfiguration": {
+                            "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration"
+                        },
                         "HlsManifests": {
                             "items": {
                                 "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration"
@@ -132373,6 +140089,7 @@
                     "required": [
                         "ChannelGroupName",
                         "ChannelName",
+                        "ContainerType",
                         "OriginEndpointName"
                     ],
                     "type": "object"
@@ -132398,6 +140115,63 @@
             ],
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.DashManifestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DrmSignaling": {
+                    "type": "string"
+                },
+                "FilterConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.FilterConfiguration"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScteDash": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.ScteDash"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "$ref": "#/definitions/AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming"
+                }
+            },
+            "required": [
+                "ManifestName"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackageV2::OriginEndpoint.DashUtcTiming": {
+            "additionalProperties": false,
+            "properties": {
+                "TimingMode": {
+                    "type": "string"
+                },
+                "TimingSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.Encryption": {
             "additionalProperties": false,
             "properties": {
@@ -132466,6 +140240,18 @@
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ForceEndpointErrorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointErrorConditions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.HlsManifestConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -132538,6 +140324,15 @@
             },
             "type": "object"
         },
+        "AWS::MediaPackageV2::OriginEndpoint.ScteDash": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkerDash": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::MediaPackageV2::OriginEndpoint.ScteHls": {
             "additionalProperties": false,
             "properties": {
@@ -133330,6 +141125,9 @@
         "AWS::MediaTailor::PlaybackConfiguration.AvailSuppression": {
             "additionalProperties": false,
             "properties": {
+                "FillPolicy": {
+                    "type": "string"
+                },
                 "Mode": {
                     "type": "string"
                 },
@@ -134183,102 +141981,312 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AssociatedRoles": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
-                            },
-                            "type": "array"
-                        },
-                        "AvailabilityZones": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "BackupRetentionPeriod": {
-                            "type": "number"
-                        },
-                        "CopyTagsToSnapshot": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBInstanceParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBPort": {
+                            "type": "number"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ServerlessScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBClusterParameterGroup": {
+            "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": {
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBInstance": {
+            "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": {
+                        "AllowMajorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBClusterParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBInstanceParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBPort": {
-                            "type": "number"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
-                        },
-                        "DeletionProtection": {
+                        "AutoMinorVersionUpgrade": {
                             "type": "boolean"
                         },
-                        "EnableCloudwatchLogsExports": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "EngineVersion": {
+                        "AvailabilityZone": {
                             "type": "string"
                         },
-                        "IamAuthEnabled": {
-                            "type": "boolean"
-                        },
-                        "KmsKeyId": {
+                        "DBClusterIdentifier": {
                             "type": "string"
                         },
-                        "PreferredBackupWindow": {
+                        "DBInstanceClass": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
+                        "DBInstanceIdentifier": {
                             "type": "string"
                         },
-                        "RestoreToTime": {
+                        "DBParameterGroupName": {
                             "type": "string"
                         },
-                        "RestoreType": {
+                        "DBSnapshotIdentifier": {
                             "type": "string"
                         },
-                        "ServerlessScalingConfiguration": {
-                            "$ref": "#/definitions/AWS::Neptune::DBCluster.ServerlessScalingConfiguration"
-                        },
-                        "SnapshotIdentifier": {
+                        "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "SourceDBClusterIdentifier": {
+                        "PreferredMaintenanceWindow": {
                             "type": "string"
                         },
-                        "StorageEncrypted": {
-                            "type": "boolean"
-                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UseLatestRestorableTime": {
-                            "type": "boolean"
-                        },
-                        "VpcSecurityGroupIds": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
                         }
                     },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBCluster"
+                        "AWS::Neptune::DBInstance"
                     ],
                     "type": "string"
                 },
@@ -134292,42 +142300,12 @@
                 }
             },
             "required": [
-                "Type"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.DBClusterRole": {
-            "additionalProperties": false,
-            "properties": {
-                "FeatureName": {
-                    "type": "string"
-                },
-                "RoleArn": {
-                    "type": "string"
-                }
-            },
-            "required": [
-                "RoleArn"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBCluster.ServerlessScalingConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "MaxCapacity": {
-                    "type": "number"
-                },
-                "MinCapacity": {
-                    "type": "number"
-                }
-            },
-            "required": [
-                "MaxCapacity",
-                "MinCapacity"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBClusterParameterGroup": {
+        "AWS::Neptune::DBParameterGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134390,7 +142368,7 @@
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBClusterParameterGroup"
+                        "AWS::Neptune::DBParameterGroup"
                     ],
                     "type": "string"
                 },
@@ -134409,7 +142387,7 @@
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBInstance": {
+        "AWS::Neptune::DBSubnetGroup": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134444,115 +142422,17 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AllowMajorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AutoMinorVersionUpgrade": {
-                            "type": "boolean"
-                        },
-                        "AvailabilityZone": {
-                            "type": "string"
-                        },
-                        "DBClusterIdentifier": {
-                            "type": "string"
-                        },
-                        "DBInstanceClass": {
-                            "type": "string"
-                        },
-                        "DBInstanceIdentifier": {
-                            "type": "string"
-                        },
-                        "DBParameterGroupName": {
-                            "type": "string"
-                        },
-                        "DBSnapshotIdentifier": {
+                        "DBSubnetGroupDescription": {
                             "type": "string"
                         },
                         "DBSubnetGroupName": {
                             "type": "string"
                         },
-                        "PreferredMaintenanceWindow": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "DBInstanceClass"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::Neptune::DBInstance"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::Neptune::DBParameterGroup": {
-            "additionalProperties": false,
-            "properties": {
-                "Condition": {
-                    "type": "string"
-                },
-                "DeletionPolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                },
-                "DependsOn": {
-                    "anyOf": [
-                        {
-                            "pattern": "^[a-zA-Z0-9]+$",
-                            "type": "string"
-                        },
-                        {
+                        "SubnetIds": {
                             "items": {
-                                "pattern": "^[a-zA-Z0-9]+$",
                                 "type": "string"
                             },
                             "type": "array"
-                        }
-                    ]
-                },
-                "Metadata": {
-                    "type": "object"
-                },
-                "Properties": {
-                    "additionalProperties": false,
-                    "properties": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "Family": {
-                            "type": "string"
-                        },
-                        "Name": {
-                            "type": "string"
-                        },
-                        "Parameters": {
-                            "type": "object"
                         },
                         "Tags": {
                             "items": {
@@ -134562,15 +142442,14 @@
                         }
                     },
                     "required": [
-                        "Description",
-                        "Family",
-                        "Parameters"
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBParameterGroup"
+                        "AWS::Neptune::DBSubnetGroup"
                     ],
                     "type": "string"
                 },
@@ -134589,7 +142468,7 @@
             ],
             "type": "object"
         },
-        "AWS::Neptune::DBSubnetGroup": {
+        "AWS::Neptune::EventSubscription": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -134624,34 +142503,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "DBSubnetGroupDescription": {
-                            "type": "string"
-                        },
-                        "DBSubnetGroupName": {
-                            "type": "string"
+                        "Enabled": {
+                            "type": "boolean"
                         },
-                        "SubnetIds": {
+                        "EventCategories": {
                             "items": {
                                 "type": "string"
                             },
                             "type": "array"
                         },
-                        "Tags": {
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
                             "items": {
-                                "$ref": "#/definitions/Tag"
+                                "type": "string"
                             },
                             "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
                         }
                     },
-                    "required": [
-                        "DBSubnetGroupDescription",
-                        "SubnetIds"
-                    ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::Neptune::DBSubnetGroup"
+                        "AWS::Neptune::EventSubscription"
                     ],
                     "type": "string"
                 },
@@ -134665,8 +142543,7 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type"
             ],
             "type": "object"
         },
@@ -135132,6 +143009,15 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts": {
+            "additionalProperties": false,
+            "properties": {
+                "TcpIdleTimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkFirewall::FirewallPolicy.IPSet": {
             "additionalProperties": false,
             "properties": {
@@ -135177,6 +143063,9 @@
         "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
             "additionalProperties": false,
             "properties": {
+                "FlowTimeouts": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FlowTimeouts"
+                },
                 "RuleOrder": {
                     "type": "string"
                 },
@@ -136082,39 +143971,311 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CoreNetworkId": {
+                        "CoreNetworkId": {
+                            "type": "string"
+                        },
+                        "EdgeLocation": {
+                            "type": "string"
+                        },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange"
+                        },
+                        "ProposedSegmentChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CoreNetworkId",
+                        "EdgeLocation",
+                        "Options",
+                        "TransportAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "SegmentName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer": {
+            "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": {
+                        "BgpOptions": {
+                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
+                        },
+                        "ConnectAttachmentId": {
+                            "type": "string"
+                        },
+                        "CoreNetworkAddress": {
+                            "type": "string"
+                        },
+                        "InsideCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PeerAddress": {
+                            "type": "string"
+                        },
+                        "SubnetArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectAttachmentId",
+                        "PeerAddress"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::ConnectPeer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "CoreNetworkAsn": {
+                    "type": "number"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "PeerAsn": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BgpConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
+                    },
+                    "type": "array"
+                },
+                "CoreNetworkAddress": {
+                    "type": "string"
+                },
+                "InsideCidrBlocks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PeerAddress": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::CoreNetwork": {
+            "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": {
+                        "Description": {
                             "type": "string"
                         },
-                        "EdgeLocation": {
+                        "GlobalNetworkId": {
                             "type": "string"
                         },
-                        "Options": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions"
-                        },
-                        "ProposedSegmentChange": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange"
+                        "PolicyDocument": {
+                            "type": "object"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "TransportAttachmentId": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "CoreNetworkId",
-                        "EdgeLocation",
-                        "Options",
-                        "TransportAttachmentId"
+                        "GlobalNetworkId"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::NetworkManager::ConnectAttachment"
+                        "AWS::NetworkManager::CoreNetwork"
                     ],
                     "type": "string"
                 },
@@ -136133,264 +144294,55 @@
             ],
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectAttachment.ConnectAttachmentOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "Protocol": {
-                    "type": "string"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectAttachment.ProposedSegmentChange": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
             "additionalProperties": false,
             "properties": {
-                "AttachmentPolicyRuleNumber": {
+                "Asn": {
                     "type": "number"
                 },
-                "SegmentName": {
+                "EdgeLocation": {
                     "type": "string"
                 },
-                "Tags": {
+                "InsideCidrBlocks": {
                     "items": {
-                        "$ref": "#/definitions/Tag"
+                        "type": "string"
                     },
                     "type": "array"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::ConnectPeer": {
-            "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": {
-                        "BgpOptions": {
-                            "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.BgpOptions"
-                        },
-                        "ConnectAttachmentId": {
-                            "type": "string"
-                        },
-                        "CoreNetworkAddress": {
-                            "type": "string"
-                        },
-                        "InsideCidrBlocks": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "PeerAddress": {
-                            "type": "string"
-                        },
-                        "SubnetArn": {
-                            "type": "string"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
-                    },
-                    "required": [
-                        "ConnectAttachmentId",
-                        "PeerAddress"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::ConnectPeer"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.BgpOptions": {
-            "additionalProperties": false,
-            "properties": {
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration": {
-            "additionalProperties": false,
-            "properties": {
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "CoreNetworkAsn": {
-                    "type": "number"
-                },
-                "PeerAddress": {
-                    "type": "string"
-                },
-                "PeerAsn": {
-                    "type": "number"
-                }
-            },
-            "type": "object"
-        },
-        "AWS::NetworkManager::ConnectPeer.ConnectPeerConfiguration": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkNetworkFunctionGroup": {
             "additionalProperties": false,
             "properties": {
-                "BgpConfigurations": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::NetworkManager::ConnectPeer.ConnectPeerBgpConfiguration"
-                    },
-                    "type": "array"
-                },
-                "CoreNetworkAddress": {
-                    "type": "string"
-                },
-                "InsideCidrBlocks": {
+                "EdgeLocations": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "PeerAddress": {
+                "Name": {
                     "type": "string"
                 },
-                "Protocol": {
-                    "type": "string"
+                "Segments": {
+                    "$ref": "#/definitions/AWS::NetworkManager::CoreNetwork.Segments"
                 }
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork": {
+        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
             "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": {
-                        "Description": {
-                            "type": "string"
-                        },
-                        "GlobalNetworkId": {
-                            "type": "string"
-                        },
-                        "PolicyDocument": {
-                            "type": "object"
-                        },
-                        "Tags": {
-                            "items": {
-                                "$ref": "#/definitions/Tag"
-                            },
-                            "type": "array"
-                        }
+                "EdgeLocations": {
+                    "items": {
+                        "type": "string"
                     },
-                    "required": [
-                        "GlobalNetworkId"
-                    ],
-                    "type": "object"
-                },
-                "Type": {
-                    "enum": [
-                        "AWS::NetworkManager::CoreNetwork"
-                    ],
-                    "type": "string"
-                },
-                "UpdateReplacePolicy": {
-                    "enum": [
-                        "Delete",
-                        "Retain",
-                        "Snapshot"
-                    ],
-                    "type": "string"
-                }
-            },
-            "required": [
-                "Type",
-                "Properties"
-            ],
-            "type": "object"
-        },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkEdge": {
-            "additionalProperties": false,
-            "properties": {
-                "Asn": {
-                    "type": "number"
+                    "type": "array"
                 },
-                "EdgeLocation": {
+                "Name": {
                     "type": "string"
                 },
-                "InsideCidrBlocks": {
+                "SharedSegments": {
                     "items": {
                         "type": "string"
                     },
@@ -136399,19 +144351,16 @@
             },
             "type": "object"
         },
-        "AWS::NetworkManager::CoreNetwork.CoreNetworkSegment": {
+        "AWS::NetworkManager::CoreNetwork.Segments": {
             "additionalProperties": false,
             "properties": {
-                "EdgeLocations": {
+                "SendTo": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "Name": {
-                    "type": "string"
-                },
-                "SharedSegments": {
+                "SendVia": {
                     "items": {
                         "type": "string"
                     },
@@ -136994,6 +144943,12 @@
                         "CoreNetworkId": {
                             "type": "string"
                         },
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange"
                         },
@@ -137034,6 +144989,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::SiteToSiteVpnAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137231,9 +145204,15 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "NetworkFunctionGroupName": {
+                            "type": "string"
+                        },
                         "PeeringId": {
                             "type": "string"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange"
                         },
@@ -137274,6 +145253,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::TransitGatewayRouteTableAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -137333,6 +145330,9 @@
                         "Options": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.VpcOptions"
                         },
+                        "ProposedNetworkFunctionGroupChange": {
+                            "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange"
+                        },
                         "ProposedSegmentChange": {
                             "$ref": "#/definitions/AWS::NetworkManager::VpcAttachment.ProposedSegmentChange"
                         },
@@ -137380,6 +145380,24 @@
             ],
             "type": "object"
         },
+        "AWS::NetworkManager::VpcAttachment.ProposedNetworkFunctionGroupChange": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentPolicyRuleNumber": {
+                    "type": "number"
+                },
+                "NetworkFunctionGroupName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::NetworkManager::VpcAttachment.ProposedSegmentChange": {
             "additionalProperties": false,
             "properties": {
@@ -138196,6 +146214,22 @@
             },
             "type": "object"
         },
+        "AWS::OSIS::Pipeline.VpcAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachToVpc": {
+                    "type": "boolean"
+                },
+                "CidrBlock": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachToVpc",
+                "CidrBlock"
+            ],
+            "type": "object"
+        },
         "AWS::OSIS::Pipeline.VpcEndpoint": {
             "additionalProperties": false,
             "properties": {
@@ -138225,6 +146259,12 @@
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "VpcAttachmentOptions": {
+                    "$ref": "#/definitions/AWS::OSIS::Pipeline.VpcAttachmentOptions"
+                },
+                "VpcEndpointManagement": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -139635,6 +147675,9 @@
                         "OffPeakWindowOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.OffPeakWindowOptions"
                         },
+                        "SkipShardMigrationWait": {
+                            "type": "boolean"
+                        },
                         "SnapshotOptions": {
                             "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
                         },
@@ -139688,6 +147731,9 @@
                 "InternalUserDatabaseEnabled": {
                     "type": "boolean"
                 },
+                "JWTOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.JWTOptions"
+                },
                 "MasterUserOptions": {
                     "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
                 },
@@ -139836,6 +147882,24 @@
             ],
             "type": "object"
         },
+        "AWS::OpenSearchService::Domain.JWTOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "PublicKey": {
+                    "type": "string"
+                },
+                "RolesKey": {
+                    "type": "string"
+                },
+                "SubjectKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::OpenSearchService::Domain.LogPublishingOption": {
             "additionalProperties": false,
             "properties": {
@@ -142775,6 +150839,200 @@
             },
             "type": "object"
         },
+        "AWS::PCAConnectorSCEP::Challenge": {
+            "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": {
+                        "ConnectorArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConnectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Challenge"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector": {
+            "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": {
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "MobileDeviceManagement": {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PCAConnectorSCEP::Connector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.IntuneConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AzureApplicationId": {
+                    "type": "string"
+                },
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AzureApplicationId",
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.MobileDeviceManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "Intune": {
+                    "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector.IntuneConfiguration"
+                }
+            },
+            "required": [
+                "Intune"
+            ],
+            "type": "object"
+        },
+        "AWS::PCAConnectorSCEP::Connector.OpenIdConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Panorama::ApplicationInstance": {
             "additionalProperties": false,
             "properties": {
@@ -146766,6 +155024,9 @@
                         "EnrichmentParameters": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeEnrichmentParameters"
                         },
+                        "KmsKeyIdentifier": {
+                            "type": "string"
+                        },
                         "LogConfiguration": {
                             "$ref": "#/definitions/AWS::Pipes::Pipe.PipeLogConfiguration"
                         },
@@ -146970,6 +155231,26 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValue": {
+                    "type": "string"
+                },
+                "DimensionValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName",
+                "DimensionValue",
+                "DimensionValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.EcsContainerOverride": {
             "additionalProperties": false,
             "properties": {
@@ -147167,6 +155448,45 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValue",
+                "MeasureValueType",
+                "MultiMeasureAttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Pipes::Pipe.MultiMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings",
+                "MultiMeasureName"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.NetworkConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -147697,6 +156017,9 @@
                 },
                 "StepFunctionStateMachineParameters": {
                     "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetStateMachineParameters"
+                },
+                "TimestreamParameters": {
+                    "$ref": "#/definitions/AWS::Pipes::Pipe.PipeTargetTimestreamParameters"
                 }
             },
             "type": "object"
@@ -147765,6 +156088,50 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.PipeTargetTimestreamParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "EpochTimeUnit": {
+                    "type": "string"
+                },
+                "MultiMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.MultiMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "SingleMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pipes::Pipe.SingleMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "TimeFieldType": {
+                    "type": "string"
+                },
+                "TimeValue": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                },
+                "VersionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionMappings",
+                "TimeValue",
+                "VersionValue"
+            ],
+            "type": "object"
+        },
         "AWS::Pipes::Pipe.PlacementConstraint": {
             "additionalProperties": false,
             "properties": {
@@ -147859,6 +156226,26 @@
             },
             "type": "object"
         },
+        "AWS::Pipes::Pipe.SingleMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValue": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureName",
+                "MeasureValue",
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
         "AWS::Proton::EnvironmentAccountConnection": {
             "additionalProperties": false,
             "properties": {
@@ -148099,6 +156486,975 @@
             ],
             "type": "object"
         },
+        "AWS::QBusiness::Application": {
+            "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": {
+                        "AttachmentsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AttachmentsConfiguration"
+                        },
+                        "AutoSubscriptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.AutoSubscriptionConfiguration"
+                        },
+                        "ClientIdsForOIDC": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.EncryptionConfiguration"
+                        },
+                        "IamIdentityProviderArn": {
+                            "type": "string"
+                        },
+                        "IdentityCenterInstanceArn": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "PersonalizationConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.PersonalizationConfiguration"
+                        },
+                        "QAppsConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Application.QAppsConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AttachmentsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttachmentsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.AutoSubscriptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoSubscribe": {
+                    "type": "string"
+                },
+                "DefaultSubscriptionType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoSubscribe"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.PersonalizationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PersonalizationControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PersonalizationControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Application.QAppsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QAppsControlMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QAppsControlMode"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentEnrichmentConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SyncSchedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource.DataSourceVpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "IndexId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeValueOperator": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeValue"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DateValue": {
+                    "type": "string"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringListValue": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.DocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InlineConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration"
+                    },
+                    "type": "array"
+                },
+                "PostExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                },
+                "PreExtractionHookConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.HookConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.HookConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InvocationCondition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::DataSource.InlineDocumentEnrichmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeCondition"
+                },
+                "DocumentContentOperator": {
+                    "type": "string"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::QBusiness::DataSource.DocumentAttributeTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CapacityConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Index.IndexCapacityConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DocumentAttributeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QBusiness::Index.DocumentAttributeConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DisplayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.DocumentAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Search": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexCapacityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.IndexStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "TextDocumentStatistics": {
+                    "$ref": "#/definitions/AWS::QBusiness::Index.TextDocumentStatistics"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Index.TextDocumentStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexedTextBytes": {
+                    "type": "number"
+                },
+                "IndexedTextDocumentCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "AuthConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.PluginAuthConfiguration"
+                        },
+                        "CustomPluginConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin.CustomPluginConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ServerUrl": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "AuthConfiguration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Plugin"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.APISchema": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.BasicAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.CustomPluginConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSchema": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.APISchema"
+                },
+                "ApiSchemaType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSchema",
+                "ApiSchemaType",
+                "Description"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.PluginAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.BasicAuthConfiguration"
+                },
+                "NoAuthConfiguration": {
+                    "type": "object"
+                },
+                "OAuth2ClientCredentialConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Plugin.OAuth2ClientCredentialConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::Plugin.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever.RetrieverConfiguration"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Configuration",
+                        "DisplayName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::Retriever"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.KendraIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.NativeIndexConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IndexId"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::Retriever.RetrieverConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KendraIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.KendraIndexConfiguration"
+                },
+                "NativeIndexConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::Retriever.NativeIndexConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience": {
+            "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": {
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "IdentityProviderConfiguration": {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience.IdentityProviderConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SamplePromptsControlMode": {
+                            "type": "string"
+                        },
+                        "Subtitle": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Title": {
+                            "type": "string"
+                        },
+                        "WelcomeMessage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QBusiness::WebExperience"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.IdentityProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "OpenIDConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration"
+                },
+                "SamlConfiguration": {
+                    "$ref": "#/definitions/AWS::QBusiness::WebExperience.SamlProviderConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.OpenIDConnectProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsArn": {
+                    "type": "string"
+                },
+                "SecretsRole": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretsArn",
+                "SecretsRole"
+            ],
+            "type": "object"
+        },
+        "AWS::QBusiness::WebExperience.SamlProviderConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthenticationUrl"
+            ],
+            "type": "object"
+        },
         "AWS::QLDB::Ledger": {
             "additionalProperties": false,
             "properties": {
@@ -148484,6 +157840,9 @@
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Analysis.SheetDefinition"
@@ -149278,6 +158637,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -149431,6 +158809,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -149515,6 +158896,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ComboChartSortConfiguration"
                 },
@@ -150532,6 +159916,9 @@
         "AWS::QuickSight::Analysis.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -150587,6 +159974,9 @@
         "AWS::QuickSight::Analysis.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -150677,6 +160067,9 @@
         "AWS::QuickSight::Analysis.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 }
@@ -151008,6 +160401,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -151164,6 +160560,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.NumericEqualityFilter"
                 },
@@ -151237,6 +160636,9 @@
         "AWS::QuickSight::Analysis.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimePickerControlDisplayOptions"
                 },
@@ -151266,6 +160668,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -151411,6 +160816,9 @@
         "AWS::QuickSight::Analysis.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.RelativeDateTimeControlDisplayOptions"
                 },
@@ -152616,6 +162024,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153129,6 +162546,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.SmallMultiplesOptions"
                 },
@@ -153491,6 +162911,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -153877,6 +163321,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DropDownControlDisplayOptions"
                 },
@@ -154723,6 +164170,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -155753,6 +165209,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157127,6 +166592,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -157136,6 +166610,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Analysis.DataLabelOptions"
                 },
@@ -157172,6 +166649,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Analysis.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -157382,6 +166874,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Analysis.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard": {
             "additionalProperties": false,
             "properties": {
@@ -158291,6 +167795,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -158444,6 +167967,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -158528,6 +168054,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ComboChartSortConfiguration"
                 },
@@ -159762,6 +169291,9 @@
         "AWS::QuickSight::Dashboard.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -159817,6 +169349,9 @@
         "AWS::QuickSight::Dashboard.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -159907,6 +169442,9 @@
         "AWS::QuickSight::Dashboard.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 }
@@ -160265,6 +169803,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -160421,6 +169962,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.NumericEqualityFilter"
                 },
@@ -160494,6 +170038,9 @@
         "AWS::QuickSight::Dashboard.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimePickerControlDisplayOptions"
                 },
@@ -160523,6 +170070,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -160668,6 +170218,9 @@
         "AWS::QuickSight::Dashboard.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.RelativeDateTimeControlDisplayOptions"
                 },
@@ -161873,6 +171426,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -162386,6 +171948,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.SmallMultiplesOptions"
                 },
@@ -162760,6 +172325,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -163146,6 +172735,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DropDownControlDisplayOptions"
                 },
@@ -165040,6 +174632,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166432,6 +176033,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -166441,6 +176051,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataLabelOptions"
                 },
@@ -166477,6 +176090,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Dashboard.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -166687,6 +176315,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Dashboard.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSet": {
             "additionalProperties": false,
             "properties": {
@@ -166761,6 +176401,12 @@
                             },
                             "type": "object"
                         },
+                        "FolderArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "ImportMode": {
                             "type": "string"
                         },
@@ -167129,6 +176775,9 @@
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.LookbackWindow"
                 }
             },
+            "required": [
+                "LookbackWindow"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
@@ -167253,8 +176902,7 @@
                 }
             },
             "required": [
-                "Alias",
-                "Source"
+                "Alias"
             ],
             "type": "object"
         },
@@ -167286,6 +176934,11 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "ColumnName",
+                "Size",
+                "SizeUnit"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.NewDefaultValues": {
@@ -167391,6 +177044,9 @@
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.IncrementalRefresh"
                 }
             },
+            "required": [
+                "IncrementalRefresh"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.RelationalTable": {
@@ -167624,8 +177280,30 @@
                 },
                 "TagColumnOperation": {
                     "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                },
+                "UntagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UntagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UntagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "TagNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
+            "required": [
+                "ColumnName",
+                "TagNames"
+            ],
             "type": "object"
         },
         "AWS::QuickSight::DataSet.UploadSettings": {
@@ -167730,6 +177408,10 @@
                             "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
                         }
                     },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -167748,7 +177430,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -167963,6 +177646,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.IdentityCenterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableIdentityPropagation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.ManifestFileLocation": {
             "additionalProperties": false,
             "properties": {
@@ -168095,6 +177787,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::DataSource.RedshiftIAMParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoCreateDatabaseUser": {
+                    "type": "boolean"
+                },
+                "DatabaseGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DatabaseUser": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::DataSource.RedshiftParameters": {
             "additionalProperties": false,
             "properties": {
@@ -168107,6 +177823,12 @@
                 "Host": {
                     "type": "string"
                 },
+                "IAMParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftIAMParameters"
+                },
+                "IdentityCenterConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.IdentityCenterConfiguration"
+                },
                 "Port": {
                     "type": "number"
                 }
@@ -168127,6 +177849,9 @@
                 },
                 "Principal": {
                     "type": "string"
+                },
+                "Resource": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -168290,6 +178015,113 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Folder": {
+            "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": {
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "FolderId": {
+                            "type": "string"
+                        },
+                        "FolderType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentFolderArn": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Folder.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SharingModel": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Folder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Folder.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::RefreshSchedule": {
             "additionalProperties": false,
             "properties": {
@@ -169286,6 +179118,25 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.CategoryInnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "Configuration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilterConfiguration"
+                },
+                "DefaultFilterControlConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.DefaultFilterControlConfiguration"
+                }
+            },
+            "required": [
+                "Column",
+                "Configuration"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.ChartAxisLabelOptions": {
             "additionalProperties": false,
             "properties": {
@@ -169478,6 +179329,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -169562,6 +179416,9 @@
                 "SecondaryYAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SortConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ComboChartSortConfiguration"
                 },
@@ -170555,6 +180412,9 @@
         "AWS::QuickSight::Template.DefaultDateTimePickerControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -170610,6 +180470,9 @@
         "AWS::QuickSight::Template.DefaultFilterDropDownControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -170700,6 +180563,9 @@
         "AWS::QuickSight::Template.DefaultRelativeDateTimeControlOptions": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 }
@@ -171031,6 +180897,9 @@
                 "Label": {
                     "type": "string"
                 },
+                "TooltipTarget": {
+                    "type": "string"
+                },
                 "Visibility": {
                     "type": "string"
                 }
@@ -171187,6 +181056,9 @@
                 "CategoryFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CategoryFilter"
                 },
+                "NestedFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.NestedFilter"
+                },
                 "NumericEqualityFilter": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.NumericEqualityFilter"
                 },
@@ -171260,6 +181132,9 @@
         "AWS::QuickSight::Template.FilterDateTimePickerControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DateTimePickerControlDisplayOptions"
                 },
@@ -171289,6 +181164,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -171434,6 +181312,9 @@
         "AWS::QuickSight::Template.FilterRelativeDateTimeControl": {
             "additionalProperties": false,
             "properties": {
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.RelativeDateTimeControlDisplayOptions"
                 },
@@ -172639,6 +182520,15 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.InnerFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CategoryInnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.CategoryInnerFilter"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.InsightConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173133,6 +183023,9 @@
                     },
                     "type": "array"
                 },
+                "SingleAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.SingleAxisOptions"
+                },
                 "SmallMultiplesOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.SmallMultiplesOptions"
                 },
@@ -173495,6 +183388,30 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.NestedFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.ColumnIdentifier"
+                },
+                "FilterId": {
+                    "type": "string"
+                },
+                "IncludeInnerSet": {
+                    "type": "boolean"
+                },
+                "InnerFilter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.InnerFilter"
+                }
+            },
+            "required": [
+                "Column",
+                "FilterId",
+                "IncludeInnerSet",
+                "InnerFilter"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Template.NullValueFormatConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -173881,6 +183798,9 @@
                 "CascadingControlConfiguration": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.CascadingControlConfiguration"
                 },
+                "CommitMode": {
+                    "type": "string"
+                },
                 "DisplayOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DropDownControlDisplayOptions"
                 },
@@ -174697,6 +184617,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.QueryExecutionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryExecutionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.RadarChartAggregatedFieldWells": {
             "additionalProperties": false,
             "properties": {
@@ -175727,6 +185656,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.SingleAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxisOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.YAxisOptions"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.SliderControlDisplayOptions": {
             "additionalProperties": false,
             "properties": {
@@ -176462,6 +186400,9 @@
                     },
                     "type": "array"
                 },
+                "QueryExecutionOptions": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.QueryExecutionOptions"
+                },
                 "Sheets": {
                     "items": {
                         "$ref": "#/definitions/AWS::QuickSight::Template.SheetDefinition"
@@ -177236,6 +187177,15 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -177245,6 +187195,9 @@
                 "CategoryAxisLabelOptions": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.ChartAxisLabelOptions"
                 },
+                "ColorConfiguration": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.WaterfallChartColorConfiguration"
+                },
                 "DataLabels": {
                     "$ref": "#/definitions/AWS::QuickSight::Template.DataLabelOptions"
                 },
@@ -177281,6 +187234,21 @@
             },
             "type": "object"
         },
+        "AWS::QuickSight::Template.WaterfallChartGroupColorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NegativeBarColor": {
+                    "type": "string"
+                },
+                "PositiveBarColor": {
+                    "type": "string"
+                },
+                "TotalBarColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
         "AWS::QuickSight::Template.WaterfallChartOptions": {
             "additionalProperties": false,
             "properties": {
@@ -177491,6 +187459,18 @@
             ],
             "type": "object"
         },
+        "AWS::QuickSight::Template.YAxisOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "YAxis": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "YAxis"
+            ],
+            "type": "object"
+        },
         "AWS::QuickSight::Theme": {
             "additionalProperties": false,
             "properties": {
@@ -178222,6 +188202,9 @@
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "Expression": {
                     "type": "string"
                 },
@@ -178328,6 +188311,9 @@
                 "DefaultFormatting": {
                     "$ref": "#/definitions/AWS::QuickSight::Topic.DefaultFormatting"
                 },
+                "DisableIndexing": {
+                    "type": "boolean"
+                },
                 "IsIncludedInTopic": {
                     "type": "boolean"
                 },
@@ -179013,9 +188999,15 @@
                         "EnableIAMDatabaseAuthentication": {
                             "type": "boolean"
                         },
+                        "EnableLocalWriteForwarding": {
+                            "type": "boolean"
+                        },
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineMode": {
                             "type": "string"
                         },
@@ -179465,6 +189457,9 @@
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180501,6 +190496,9 @@
                         "Engine": {
                             "type": "string"
                         },
+                        "EngineLifecycleSupport": {
+                            "type": "string"
+                        },
                         "EngineVersion": {
                             "type": "string"
                         },
@@ -180512,6 +190510,12 @@
                         },
                         "StorageEncrypted": {
                             "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "type": "object"
@@ -181220,6 +191224,15 @@
                 "BucketName": {
                     "type": "string"
                 },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogExports": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
                 "S3KeyPrefix": {
                     "type": "string"
                 }
@@ -184641,6 +194654,15 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "AcceptRoleSessionName": {
+                            "type": "boolean"
+                        },
+                        "AttributeMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RolesAnywhere::Profile.AttributeMapping"
+                            },
+                            "type": "array"
+                        },
                         "DurationSeconds": {
                             "type": "number"
                         },
@@ -184702,6 +194724,37 @@
             ],
             "type": "object"
         },
+        "AWS::RolesAnywhere::Profile.AttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateField": {
+                    "type": "string"
+                },
+                "MappingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RolesAnywhere::Profile.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateField",
+                "MappingRules"
+            ],
+            "type": "object"
+        },
+        "AWS::RolesAnywhere::Profile.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Specifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Specifier"
+            ],
+            "type": "object"
+        },
         "AWS::RolesAnywhere::TrustAnchor": {
             "additionalProperties": false,
             "properties": {
@@ -186933,6 +196986,9 @@
                 "FirewallDomainListId": {
                     "type": "string"
                 },
+                "FirewallDomainRedirectionAction": {
+                    "type": "string"
+                },
                 "Priority": {
                     "type": "number"
                 },
@@ -187528,6 +197584,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "DelegationRecord": {
+                            "type": "string"
+                        },
                         "DomainName": {
                             "type": "string"
                         },
@@ -187554,7 +197613,6 @@
                         }
                     },
                     "required": [
-                        "DomainName",
                         "RuleType"
                     ],
                     "type": "object"
@@ -188492,6 +198550,9 @@
                         "$ref": "#/definitions/AWS::S3::Bucket.Rule"
                     },
                     "type": "array"
+                },
+                "TransitionDefaultMinimumObjectSize": {
+                    "type": "string"
                 }
             },
             "required": [
@@ -190108,6 +200169,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.BucketEncryption"
+                        },
                         "BucketName": {
                             "type": "string"
                         },
@@ -190140,11 +200204,53 @@
                 }
             },
             "required": [
-                "Type",
-                "Properties"
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
             ],
             "type": "object"
         },
+        "AWS::S3Express::DirectoryBucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3Express::DirectoryBucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
         "AWS::S3ObjectLambda::AccessPoint": {
             "additionalProperties": false,
             "properties": {
@@ -191158,6 +201264,18 @@
             ],
             "type": "object"
         },
+        "AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventBusArn"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
             "additionalProperties": false,
             "properties": {
@@ -191167,6 +201285,9 @@
                 "Enabled": {
                     "type": "boolean"
                 },
+                "EventBridgeDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventBridgeDestination"
+                },
                 "KinesisFirehoseDestination": {
                     "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
                 },
@@ -191513,6 +201634,1175 @@
             },
             "type": "object"
         },
+        "AWS::SES::MailManagerAddonInstance": {
+            "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": {
+                        "AddonSubscriptionId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonSubscriptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerAddonSubscription": {
+            "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": {
+                        "AddonName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerAddonSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive": {
+            "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": {
+                        "ArchiveName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Retention": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive.ArchiveRetention"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerArchive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerArchive.ArchiveRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "RetentionPeriod": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RetentionPeriod"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint": {
+            "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": {
+                        "IngressPointConfiguration": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint.IngressPointConfiguration"
+                        },
+                        "IngressPointName": {
+                            "type": "string"
+                        },
+                        "RuleSetId": {
+                            "type": "string"
+                        },
+                        "StatusToUpdate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RuleSetId",
+                        "TrafficPolicyId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerIngressPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerIngressPoint.IngressPointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SmtpPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay": {
+            "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": {
+                        "Authentication": {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay.RelayAuthentication"
+                        },
+                        "RelayName": {
+                            "type": "string"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "ServerName",
+                        "ServerPort"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRelay"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRelay.RelayAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "NoAuthentication": {
+                    "type": "object"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet": {
+            "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": {
+                        "RuleSetName": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ArchiveAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "TargetArchive": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArchive"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.DeliverToMailboxAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailboxArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MailboxArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RelayAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "MailFrom": {
+                    "type": "string"
+                },
+                "Relay": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Relay"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.ReplaceRecipientAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplaceWith": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleAction"
+                    },
+                    "type": "array"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Unless": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeader": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.AddHeaderAction"
+                },
+                "Archive": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ArchiveAction"
+                },
+                "DeliverToMailbox": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.DeliverToMailboxAction"
+                },
+                "Drop": {
+                    "type": "object"
+                },
+                "Relay": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RelayAction"
+                },
+                "ReplaceRecipient": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.ReplaceRecipientAction"
+                },
+                "Send": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.SendAction"
+                },
+                "WriteToS3": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.S3Action"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleBooleanExpression"
+                },
+                "DmarcExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleDmarcExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpExpression"
+                },
+                "NumberExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberExpression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringExpression"
+                },
+                "VerdictExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleDmarcExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleNumberToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "MimeHeaderAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.RuleVerdictToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerRuleSet.Analysis"
+                },
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                },
+                "S3SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerRuleSet.SendAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionFailurePolicy": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy": {
+            "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": {
+                        "DefaultAction": {
+                            "type": "string"
+                        },
+                        "MaxMessageSizeBytes": {
+                            "type": "number"
+                        },
+                        "PolicyStatements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyStatement"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficPolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "PolicyStatements"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::MailManagerTrafficPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Analyzer": {
+                    "type": "string"
+                },
+                "ResultField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Analyzer",
+                "ResultField"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressBooleanToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Analysis": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressAnalysis"
+                }
+            },
+            "required": [
+                "Analysis"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressStringToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Evaluate": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Evaluate",
+                "Operator",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolToEvaluate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attribute"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressBooleanExpression"
+                },
+                "IpExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressIpv4Expression"
+                },
+                "StringExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressStringExpression"
+                },
+                "TlsExpression": {
+                    "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.IngressTlsProtocolExpression"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::MailManagerTrafficPolicy.PolicyStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy.PolicyCondition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Conditions"
+            ],
+            "type": "object"
+        },
         "AWS::SES::ReceiptFilter": {
             "additionalProperties": false,
             "properties": {
@@ -191804,6 +203094,9 @@
                 "BucketName": {
                     "type": "string"
                 },
+                "IamRoleArn": {
+                    "type": "string"
+                },
                 "KmsKeyArn": {
                     "type": "string"
                 },
@@ -194955,6 +206248,342 @@
             ],
             "type": "object"
         },
+        "AWS::SSMQuickSetup::ConfigurationManager": {
+            "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": {
+                        "ConfigurationDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationDefinitions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMQuickSetup::ConfigurationManager"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.ConfigurationDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeploymentAdministrationRoleArn": {
+                    "type": "string"
+                },
+                "LocalDeploymentExecutionRoleName": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "TypeVersion": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMQuickSetup::ConfigurationManager.StatusSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "LastUpdatedAt": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "StatusDetails": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusMessage": {
+                    "type": "string"
+                },
+                "StatusType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LastUpdatedAt",
+                "StatusType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application": {
+            "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": {
+                        "ApplicationProviderArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PortalOptions": {
+                            "$ref": "#/definitions/AWS::SSO::Application.PortalOptionsConfiguration"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationProviderArn",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Application.PortalOptionsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SignInOptions": {
+                    "$ref": "#/definitions/AWS::SSO::Application.SignInOptions"
+                },
+                "Visibility": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSO::Application.SignInOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationUrl": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Origin"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::ApplicationAssignment": {
+            "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"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "PrincipalId",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::ApplicationAssignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::Assignment": {
             "additionalProperties": false,
             "properties": {
@@ -195040,6 +206669,73 @@
             ],
             "type": "object"
         },
+        "AWS::SSO::Instance": {
+            "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": {
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
             "additionalProperties": false,
             "properties": {
@@ -195177,55 +206873,168 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "CustomerManagedPolicyReferences": {
-                            "items": {
-                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
-                            },
-                            "type": "array"
-                        },
-                        "Description": {
-                            "type": "string"
-                        },
-                        "InlinePolicy": {
-                            "type": "object"
-                        },
-                        "InstanceArn": {
+                        "CustomerManagedPolicyReferences": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
+                        },
+                        "RelayStateType": {
+                            "type": "string"
+                        },
+                        "SessionDuration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::PermissionSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet.PermissionsBoundary": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedPolicyReference": {
+                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
+                },
+                "ManagedPolicyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::App": {
+            "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": {
+                        "AppName": {
                             "type": "string"
                         },
-                        "ManagedPolicies": {
-                            "items": {
-                                "type": "string"
-                            },
-                            "type": "array"
-                        },
-                        "Name": {
+                        "AppType": {
                             "type": "string"
                         },
-                        "PermissionsBoundary": {
-                            "$ref": "#/definitions/AWS::SSO::PermissionSet.PermissionsBoundary"
-                        },
-                        "RelayStateType": {
+                        "DomainId": {
                             "type": "string"
                         },
-                        "SessionDuration": {
-                            "type": "string"
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
                         }
                     },
                     "required": [
-                        "InstanceArn",
-                        "Name"
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SSO::PermissionSet"
+                        "AWS::SageMaker::App"
                     ],
                     "type": "string"
                 },
@@ -195244,34 +207053,25 @@
             ],
             "type": "object"
         },
-        "AWS::SSO::PermissionSet.CustomerManagedPolicyReference": {
+        "AWS::SageMaker::App.ResourceSpec": {
             "additionalProperties": false,
             "properties": {
-                "Name": {
+                "InstanceType": {
                     "type": "string"
                 },
-                "Path": {
+                "LifecycleConfigArn": {
                     "type": "string"
-                }
-            },
-            "required": [
-                "Name"
-            ],
-            "type": "object"
-        },
-        "AWS::SSO::PermissionSet.PermissionsBoundary": {
-            "additionalProperties": false,
-            "properties": {
-                "CustomerManagedPolicyReference": {
-                    "$ref": "#/definitions/AWS::SSO::PermissionSet.CustomerManagedPolicyReference"
                 },
-                "ManagedPolicyArn": {
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::App": {
+        "AWS::SageMaker::AppImageConfig": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195306,39 +207106,33 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppName": {
+                        "AppImageConfigName": {
                             "type": "string"
                         },
-                        "AppType": {
-                            "type": "string"
+                        "CodeEditorAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
                         },
-                        "DomainId": {
-                            "type": "string"
+                        "JupyterLabAppImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
                         },
-                        "ResourceSpec": {
-                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
-                        },
-                        "UserProfileName": {
-                            "type": "string"
                         }
                     },
                     "required": [
-                        "AppName",
-                        "AppType",
-                        "DomainId",
-                        "UserProfileName"
+                        "AppImageConfigName"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::App"
+                        "AWS::SageMaker::AppImageConfig"
                     ],
                     "type": "string"
                 },
@@ -195357,22 +207151,113 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::App.ResourceSpec": {
+        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
             "additionalProperties": false,
             "properties": {
-                "InstanceType": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
                     "type": "string"
                 },
-                "SageMakerImageArn": {
+                "Value": {
                     "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
                 },
-                "SageMakerImageVersionArn": {
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
                     "type": "string"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig": {
+        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileSystemConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
+                },
+                "KernelSpecs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "KernelSpecs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "DisplayName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Cluster": {
             "additionalProperties": false,
             "properties": {
                 "Condition": {
@@ -195407,33 +207292,39 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "AppImageConfigName": {
+                        "ClusterName": {
                             "type": "string"
                         },
-                        "CodeEditorAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig"
+                        "InstanceGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceGroup"
+                            },
+                            "type": "array"
                         },
-                        "JupyterLabAppImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig"
+                        "NodeRecovery": {
+                            "type": "string"
                         },
-                        "KernelGatewayImageConfig": {
-                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        "Orchestrator": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.Orchestrator"
                         },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
                             },
                             "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster.VpcConfig"
                         }
                     },
                     "required": [
-                        "AppImageConfigName"
+                        "InstanceGroups"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SageMaker::AppImageConfig"
+                        "AWS::SageMaker::Cluster"
                     ],
                     "type": "string"
                 },
@@ -195452,109 +207343,129 @@
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CodeEditorAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterEbsVolumeConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "VolumeSizeInGB": {
+                    "type": "number"
                 }
             },
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.ContainerConfig": {
+        "AWS::SageMaker::Cluster.ClusterInstanceGroup": {
             "additionalProperties": false,
             "properties": {
-                "ContainerArguments": {
+                "CurrentCount": {
+                    "type": "number"
+                },
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceGroupName": {
+                    "type": "string"
+                },
+                "InstanceStorageConfigs": {
                     "items": {
-                        "type": "string"
+                        "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterInstanceStorageConfig"
                     },
                     "type": "array"
                 },
-                "ContainerEntrypoint": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LifeCycleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterLifeCycleConfig"
+                },
+                "OnStartDeepHealthChecks": {
                     "items": {
                         "type": "string"
                     },
                     "type": "array"
                 },
-                "ContainerEnvironmentVariables": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable"
-                    },
-                    "type": "array"
+                "ThreadsPerCore": {
+                    "type": "number"
                 }
             },
+            "required": [
+                "ExecutionRole",
+                "InstanceCount",
+                "InstanceGroupName",
+                "InstanceType",
+                "LifeCycleConfig"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.CustomImageContainerEnvironmentVariable": {
+        "AWS::SageMaker::Cluster.ClusterInstanceStorageConfig": {
             "additionalProperties": false,
             "properties": {
-                "Key": {
-                    "type": "string"
-                },
-                "Value": {
-                    "type": "string"
+                "EbsVolumeConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterEbsVolumeConfig"
                 }
             },
-            "required": [
-                "Key",
-                "Value"
-            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+        "AWS::SageMaker::Cluster.ClusterLifeCycleConfig": {
             "additionalProperties": false,
             "properties": {
-                "DefaultGid": {
-                    "type": "number"
-                },
-                "DefaultUid": {
-                    "type": "number"
+                "OnCreate": {
+                    "type": "string"
                 },
-                "MountPath": {
+                "SourceS3Uri": {
                     "type": "string"
                 }
             },
+            "required": [
+                "OnCreate",
+                "SourceS3Uri"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.JupyterLabAppImageConfig": {
+        "AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig": {
             "additionalProperties": false,
             "properties": {
-                "ContainerConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.ContainerConfig"
+                "ClusterArn": {
+                    "type": "string"
                 }
             },
+            "required": [
+                "ClusterArn"
+            ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig": {
+        "AWS::SageMaker::Cluster.Orchestrator": {
             "additionalProperties": false,
             "properties": {
-                "FileSystemConfig": {
-                    "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.FileSystemConfig"
-                },
-                "KernelSpecs": {
-                    "items": {
-                        "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelSpec"
-                    },
-                    "type": "array"
+                "Eks": {
+                    "$ref": "#/definitions/AWS::SageMaker::Cluster.ClusterOrchestratorEksConfig"
                 }
             },
             "required": [
-                "KernelSpecs"
+                "Eks"
             ],
             "type": "object"
         },
-        "AWS::SageMaker::AppImageConfig.KernelSpec": {
+        "AWS::SageMaker::Cluster.VpcConfig": {
             "additionalProperties": false,
             "properties": {
-                "DisplayName": {
-                    "type": "string"
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 },
-                "Name": {
-                    "type": "string"
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "required": [
-                "Name"
+                "SecurityGroupIds",
+                "Subnets"
             ],
             "type": "object"
         },
@@ -196350,9 +208261,21 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
@@ -196446,9 +208369,21 @@
         "AWS::SageMaker::Domain.DefaultSpaceSettings": {
             "additionalProperties": false,
             "properties": {
+                "CustomFileSystemConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomFileSystemConfig"
+                    },
+                    "type": "array"
+                },
+                "CustomPosixUserConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.CustomPosixUserConfig"
+                },
                 "ExecutionRole": {
                     "type": "string"
                 },
+                "JupyterLabAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterLabAppSettings"
+                },
                 "JupyterServerAppSettings": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
                 },
@@ -196460,6 +208395,9 @@
                         "type": "string"
                     },
                     "type": "array"
+                },
+                "SpaceStorageSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.DefaultSpaceStorageSettings"
                 }
             },
             "required": [
@@ -196524,9 +208462,30 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Domain.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Domain.CodeRepository"
@@ -196556,6 +208515,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196571,6 +208536,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -196656,6 +208627,24 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Domain.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Domain.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -196706,6 +208695,9 @@
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.StudioWebPortalSettings"
                 }
             },
             "required": [
@@ -197790,6 +209782,9 @@
                         },
                         "VendorGuidance": {
                             "type": "string"
+                        },
+                        "Version": {
+                            "type": "number"
                         }
                     },
                     "required": [
@@ -198277,6 +210272,97 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::MlflowTrackingServer": {
+            "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": {
+                        "ArtifactStoreUri": {
+                            "type": "string"
+                        },
+                        "AutomaticModelRegistration": {
+                            "type": "boolean"
+                        },
+                        "MlflowVersion": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingServerName": {
+                            "type": "string"
+                        },
+                        "TrackingServerSize": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ArtifactStoreUri",
+                        "RoleArn",
+                        "TrackingServerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MlflowTrackingServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model": {
             "additionalProperties": false,
             "properties": {
@@ -198365,6 +210451,22 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::Model.AdditionalModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.S3DataSource"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "S3DataSource"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ContainerDefinition": {
             "additionalProperties": false,
             "properties": {
@@ -198401,6 +210503,18 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Model.HubAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HubContentArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HubContentArn"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::Model.ImageConfig": {
             "additionalProperties": false,
             "properties": {
@@ -198479,6 +210593,9 @@
                 "CompressionType": {
                     "type": "string"
                 },
+                "HubAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.HubAccessConfig"
+                },
                 "ModelAccessConfig": {
                     "$ref": "#/definitions/AWS::SageMaker::Model.ModelAccessConfig"
                 },
@@ -200000,6 +212117,9 @@
                         "ModelApprovalStatus": {
                             "type": "string"
                         },
+                        "ModelCard": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelCard"
+                        },
                         "ModelMetrics": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelMetrics"
                         },
@@ -200021,12 +212141,18 @@
                         "SamplePayloadUrl": {
                             "type": "string"
                         },
+                        "SecurityConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SecurityConfig"
+                        },
                         "SkipModelValidation": {
                             "type": "string"
                         },
                         "SourceAlgorithmSpecification": {
                             "$ref": "#/definitions/AWS::SageMaker::ModelPackage.SourceAlgorithmSpecification"
                         },
+                        "SourceUri": {
+                            "type": "string"
+                        },
                         "Tags": {
                             "items": {
                                 "$ref": "#/definitions/Tag"
@@ -200309,6 +212435,34 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelAccessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceptEula": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AcceptEula"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.ModelCard": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCardContent": {
+                    "type": "string"
+                },
+                "ModelCardStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ModelCardContent",
+                "ModelCardStatus"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelDataQuality": {
             "additionalProperties": false,
             "properties": {
@@ -200321,6 +212475,15 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3DataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.S3ModelDataSource"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.ModelInput": {
             "additionalProperties": false,
             "properties": {
@@ -200378,6 +212541,9 @@
                 "ImageDigest": {
                     "type": "string"
                 },
+                "ModelDataSource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelDataSource"
+                },
                 "ModelDataUrl": {
                     "type": "string"
                 },
@@ -200452,6 +212618,41 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::ModelPackage.S3ModelDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionType": {
+                    "type": "string"
+                },
+                "ModelAccessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelPackage.ModelAccessConfig"
+                },
+                "S3DataType": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CompressionType",
+                "S3DataType",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackage.SecurityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKeyId"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::ModelPackage.SourceAlgorithm": {
             "additionalProperties": false,
             "properties": {
@@ -202274,6 +214475,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202289,6 +214496,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202311,6 +214524,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202320,18 +214536,42 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceAppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceIdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceCodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::Space.ResourceSpec"
                 }
             },
             "type": "object"
         },
+        "AWS::SageMaker::Space.SpaceIdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::Space.SpaceJupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::Space.SpaceAppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::Space.CodeRepository"
@@ -202395,6 +214635,85 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::StudioLifecycleConfig": {
+            "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": {
+                        "StudioLifecycleConfigAppType": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigContent": {
+                            "type": "string"
+                        },
+                        "StudioLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StudioLifecycleConfigAppType",
+                        "StudioLifecycleConfigContent",
+                        "StudioLifecycleConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::StudioLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile": {
             "additionalProperties": false,
             "properties": {
@@ -202479,9 +214798,21 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.AppLifecycleManagement": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.IdleSettings"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.CodeEditorAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CustomImages": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
@@ -202596,9 +214927,30 @@
             ],
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.IdleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "LifecycleManagement": {
+                    "type": "string"
+                },
+                "MaxIdleTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "MinIdleTimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.JupyterLabAppSettings": {
             "additionalProperties": false,
             "properties": {
+                "AppLifecycleManagement": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.AppLifecycleManagement"
+                },
                 "CodeRepositories": {
                     "items": {
                         "$ref": "#/definitions/AWS::SageMaker::UserProfile.CodeRepository"
@@ -202628,6 +214980,12 @@
             "properties": {
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202643,6 +215001,12 @@
                 },
                 "DefaultResourceSpec": {
                     "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                },
+                "LifecycleConfigArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
                 }
             },
             "type": "object"
@@ -202665,6 +215029,9 @@
                 "InstanceType": {
                     "type": "string"
                 },
+                "LifecycleConfigArn": {
+                    "type": "string"
+                },
                 "SageMakerImageArn": {
                     "type": "string"
                 },
@@ -202689,6 +215056,24 @@
             },
             "type": "object"
         },
+        "AWS::SageMaker::UserProfile.StudioWebPortalSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HiddenAppTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HiddenMlTools": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SageMaker::UserProfile.UserSettings": {
             "additionalProperties": false,
             "properties": {
@@ -202736,6 +215121,9 @@
                 },
                 "StudioWebPortal": {
                     "type": "string"
+                },
+                "StudioWebPortalSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.StudioWebPortalSettings"
                 }
             },
             "type": "object"
@@ -203805,6 +216193,13 @@
                             "type": "object"
                         }
                     },
+                    "required": [
+                        "Actions",
+                        "Criteria",
+                        "Description",
+                        "RuleName",
+                        "RuleOrder"
+                    ],
                     "type": "object"
                 },
                 "Type": {
@@ -203823,7 +216218,8 @@
                 }
             },
             "required": [
-                "Type"
+                "Type",
+                "Properties"
             ],
             "type": "object"
         },
@@ -204245,6 +216641,210 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::ConfigurationPolicy": {
+            "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": {
+                        "ConfigurationPolicy": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.Policy"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicy",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ConfigurationPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityHub": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.ParameterConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecurityControlId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EnabledSecurityControlIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlCustomParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlCustomParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecurityHub::ConfigurationPolicy.SecurityHubPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledStandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityControlsConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy.SecurityControlsConfiguration"
+                },
+                "ServiceEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::DelegatedAdmin": {
             "additionalProperties": false,
             "properties": {
@@ -204310,6 +216910,77 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::FindingAggregator": {
+            "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": {
+                        "RegionLinkingMode": {
+                            "type": "string"
+                        },
+                        "Regions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegionLinkingMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::FindingAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::Hub": {
             "additionalProperties": false,
             "properties": {
@@ -205171,6 +217842,150 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::OrganizationConfiguration": {
+            "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": {
+                        "AutoEnable": {
+                            "type": "boolean"
+                        },
+                        "AutoEnableStandards": {
+                            "type": "string"
+                        },
+                        "ConfigurationType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoEnable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::OrganizationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::PolicyAssociation": {
+            "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": {
+                        "ConfigurationPolicyId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationPolicyId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::PolicyAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
         "AWS::SecurityHub::ProductSubscription": {
             "additionalProperties": false,
             "properties": {
@@ -205206,18 +218021,98 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
-                        "ProductArn": {
+                        "ProductArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::ProductSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl": {
+            "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": {
+                        "LastUpdateReason": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityControlArn": {
+                            "type": "string"
+                        },
+                        "SecurityControlId": {
                             "type": "string"
                         }
                     },
                     "required": [
-                        "ProductArn"
+                        "Parameters"
                     ],
                     "type": "object"
                 },
                 "Type": {
                     "enum": [
-                        "AWS::SecurityHub::ProductSubscription"
+                        "AWS::SecurityHub::SecurityControl"
                     ],
                     "type": "string"
                 },
@@ -205236,6 +218131,60 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityHub::SecurityControl.ParameterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "$ref": "#/definitions/AWS::SecurityHub::SecurityControl.ParameterValue"
+                },
+                "ValueType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::SecurityControl.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Boolean": {
+                    "type": "boolean"
+                },
+                "Double": {
+                    "type": "number"
+                },
+                "Enum": {
+                    "type": "string"
+                },
+                "EnumList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Integer": {
+                    "type": "number"
+                },
+                "IntegerList": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "String": {
+                    "type": "string"
+                },
+                "StringList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
         "AWS::SecurityHub::Standard": {
             "additionalProperties": false,
             "properties": {
@@ -205685,6 +218634,112 @@
             ],
             "type": "object"
         },
+        "AWS::SecurityLake::SubscriberNotification": {
+            "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": {
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.NotificationConfiguration"
+                        },
+                        "SubscriberArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationConfiguration",
+                        "SubscriberArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityLake::SubscriberNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationApiKeyName": {
+                    "type": "string"
+                },
+                "AuthorizationApiKeyValue": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "TargetRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "TargetRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityLake::SubscriberNotification.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpsNotificationConfiguration": {
+                    "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification.HttpsNotificationConfiguration"
+                },
+                "SqsNotificationConfiguration": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
         "AWS::Serverless::Api": {
             "additionalProperties": false,
             "properties": {
@@ -211372,6 +224427,9 @@
                 "Properties": {
                     "additionalProperties": false,
                     "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity.EncryptionConfiguration"
+                        },
                         "Name": {
                             "type": "string"
                         },
@@ -211408,6 +224466,24 @@
             ],
             "type": "object"
         },
+        "AWS::StepFunctions::Activity.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::Activity.TagsEntry": {
             "additionalProperties": false,
             "properties": {
@@ -211477,6 +224553,9 @@
                             },
                             "type": "object"
                         },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.EncryptionConfiguration"
+                        },
                         "LoggingConfiguration": {
                             "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
                         },
@@ -211534,6 +224613,24 @@
             },
             "type": "object"
         },
+        "AWS::StepFunctions::StateMachine.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsDataKeyReusePeriodSeconds": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
         "AWS::StepFunctions::StateMachine.LogDestination": {
             "additionalProperties": false,
             "properties": {
@@ -212068,6 +225165,12 @@
                         "Name": {
                             "type": "string"
                         },
+                        "ResourcesToReplicateTags": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
                         "RunConfig": {
                             "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
                         },
@@ -212399,6 +225502,9 @@
                             },
                             "type": "array"
                         },
+                        "DatabaseArn": {
+                            "type": "string"
+                        },
                         "Instances": {
                             "items": {
                                 "type": "string"
@@ -213364,6 +226470,9 @@
                         "LoggingRole": {
                             "type": "string"
                         },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
                         "SftpConfig": {
                             "$ref": "#/definitions/AWS::Transfer::Connector.SftpConfig"
                         },
@@ -214065,6 +227174,10 @@
                     "type": "string"
                 }
             },
+            "required": [
+                "DestinationFileLocation",
+                "Type"
+            ],
             "type": "object"
         },
         "AWS::Transfer::Workflow.DeleteStepDetails": {
@@ -214292,13 +227405,93 @@
             "properties": {
                 "CognitoUserPoolConfiguration": {
                     "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.CognitoUserPoolConfiguration"
+                },
+                "OpenIdConnectConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audiences": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdPrefix": {
+                    "type": "string"
+                },
+                "GroupConfiguration": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "TokenSelection": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection"
                 }
             },
             "required": [
-                "CognitoUserPoolConfiguration"
+                "Issuer",
+                "TokenSelection"
             ],
             "type": "object"
         },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupClaim": {
+                    "type": "string"
+                },
+                "GroupEntityType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupClaim",
+                "GroupEntityType"
+            ],
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PrincipalIdClaim": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::VerifiedPermissions::IdentitySource.OpenIdConnectTokenSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectAccessTokenConfiguration"
+                },
+                "IdentityTokenOnly": {
+                    "$ref": "#/definitions/AWS::VerifiedPermissions::IdentitySource.OpenIdConnectIdentityTokenConfiguration"
+                }
+            },
+            "type": "object"
+        },
         "AWS::VerifiedPermissions::Policy": {
             "additionalProperties": false,
             "properties": {
@@ -220992,6 +234185,140 @@
             },
             "type": "object"
         },
+        "AWS::WorkSpaces::WorkspacesPool": {
+            "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": {
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.ApplicationSettings"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Capacity": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.Capacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutSettings": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool.TimeoutSettings"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "Capacity",
+                        "DirectoryId",
+                        "PoolName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::WorkspacesPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SettingsGroup": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.Capacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredUserSessions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredUserSessions"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::WorkspacesPool.TimeoutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "IdleDisconnectTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "MaxUserDurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
         "AWS::WorkSpacesThinClient::Environment": {
             "additionalProperties": false,
             "properties": {
@@ -221036,6 +234363,12 @@
                         "DesktopEndpoint": {
                             "type": "string"
                         },
+                        "DeviceCreationTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
                         "KmsKeyArn": {
                             "type": "string"
                         },
@@ -221248,6 +234581,12 @@
                         },
                         "PortalArn": {
                             "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
                         }
                     },
                     "required": [
@@ -221774,6 +235113,9 @@
                         "CustomerManagedKey": {
                             "type": "string"
                         },
+                        "DeepLinkAllowed": {
+                            "type": "string"
+                        },
                         "DisconnectTimeoutInMinutes": {
                             "type": "number"
                         },
@@ -222802,6 +236144,9 @@
                         {
                             "$ref": "#/definitions/AWS::APS::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ARCZonalShift::AutoshiftObserverNotificationStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ARCZonalShift::ZonalAutoshiftConfiguration"
                         },
@@ -223078,6 +236423,9 @@
                         {
                             "$ref": "#/definitions/AWS::AppSync::SourceApiAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::AppTest::TestCase"
+                        },
                         {
                             "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
                         },
@@ -223087,6 +236435,9 @@
                         {
                             "$ref": "#/definitions/AWS::ApplicationInsights::Application"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationSignals::ServiceLevelObjective"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Athena::CapacityReservation"
                         },
@@ -223186,12 +236537,30 @@
                         {
                             "$ref": "#/definitions/AWS::Bedrock::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::FlowVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::Guardrail"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::GuardrailVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Bedrock::KnowledgeBase"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::Prompt"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Bedrock::PromptVersion"
+                        },
                         {
                             "$ref": "#/definitions/AWS::BillingConductor::BillingGroup"
                         },
@@ -223252,6 +236621,12 @@
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::ConfiguredTableAssociation"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdMappingTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CleanRooms::IdNamespaceAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::CleanRooms::Membership"
                         },
@@ -223528,6 +236903,9 @@
                         {
                             "$ref": "#/definitions/AWS::Config::StoredQuery"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::AgentStatus"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::ApprovedOrigin"
                         },
@@ -223591,6 +236969,9 @@
                         {
                             "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyStructure"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Connect::View"
                         },
@@ -223738,18 +237119,30 @@
                         {
                             "$ref": "#/definitions/AWS::DataZone::Environment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::EnvironmentActions"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentBlueprintConfiguration"
                         },
                         {
                             "$ref": "#/definitions/AWS::DataZone::EnvironmentProfile"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::GroupProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::Project"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::ProjectMembership"
+                        },
                         {
                             "$ref": "#/definitions/AWS::DataZone::SubscriptionTarget"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::DataZone::UserProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Farm"
                         },
@@ -223762,6 +237155,9 @@
                         {
                             "$ref": "#/definitions/AWS::Deadline::MeteredProduct"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Deadline::Monitor"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Deadline::Queue"
                         },
@@ -224491,6 +237887,9 @@
                         {
                             "$ref": "#/definitions/AWS::Glue::Trigger"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::UsageProfile"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Glue::Workflow"
                         },
@@ -224569,6 +237968,9 @@
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::IPSet"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::MalwareProtectionPlan"
+                        },
                         {
                             "$ref": "#/definitions/AWS::GuardDuty::Master"
                         },
@@ -224644,6 +238046,9 @@
                         {
                             "$ref": "#/definitions/AWS::IVS::PlaybackRestrictionPolicy"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PublicKey"
+                        },
                         {
                             "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
                         },
@@ -224953,6 +238358,9 @@
                         {
                             "$ref": "#/definitions/AWS::KendraRanking::ExecutionPlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::ResourcePolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Kinesis::Stream"
                         },
@@ -225040,6 +238448,9 @@
                         {
                             "$ref": "#/definitions/AWS::Lambda::Version"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::LaunchWizard::Deployment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Lex::Bot"
                         },
@@ -225250,6 +238661,24 @@
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Channel"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::ChannelPlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::CloudWatchAlarmTemplateGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::EventBridgeRuleTemplateGroup"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Input"
                         },
@@ -225262,6 +238691,15 @@
                         {
                             "$ref": "#/definitions/AWS::MediaLive::Multiplexprogram"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Network"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SdiSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::SignalMap"
+                        },
                         {
                             "$ref": "#/definitions/AWS::MediaPackage::Asset"
                         },
@@ -225343,6 +238781,9 @@
                         {
                             "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::EventSubscription"
+                        },
                         {
                             "$ref": "#/definitions/AWS::NeptuneGraph::Graph"
                         },
@@ -225520,6 +238961,12 @@
                         {
                             "$ref": "#/definitions/AWS::PCAConnectorAD::TemplateGroupAccessControlEntry"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Challenge"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PCAConnectorSCEP::Connector"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
                         },
@@ -225628,6 +239075,24 @@
                         {
                             "$ref": "#/definitions/AWS::Proton::ServiceTemplate"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Plugin"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::Retriever"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QBusiness::WebExperience"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QLDB::Ledger"
                         },
@@ -225646,6 +239111,9 @@
                         {
                             "$ref": "#/definitions/AWS::QuickSight::DataSource"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Folder"
+                        },
                         {
                             "$ref": "#/definitions/AWS::QuickSight::RefreshSchedule"
                         },
@@ -225973,6 +239441,27 @@
                         {
                             "$ref": "#/definitions/AWS::SES::EmailIdentity"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerAddonSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerArchive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerIngressPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRelay"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::MailManagerTrafficPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SES::ReceiptFilter"
                         },
@@ -226054,9 +239543,21 @@
                         {
                             "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSMQuickSetup::ConfigurationManager"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::ApplicationAssignment"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::Assignment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Instance"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
                         },
@@ -226069,6 +239570,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Cluster"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
                         },
@@ -226105,6 +239609,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::InferenceExperiment"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MlflowTrackingServer"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Model"
                         },
@@ -226144,6 +239651,9 @@
                         {
                             "$ref": "#/definitions/AWS::SageMaker::Space"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::StudioLifecycleConfig"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SageMaker::UserProfile"
                         },
@@ -226171,18 +239681,33 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::AutomationRule"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::ConfigurationPolicy"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::DelegatedAdmin"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::FindingAggregator"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Hub"
                         },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Insight"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::OrganizationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::PolicyAssociation"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::ProductSubscription"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::SecurityControl"
+                        },
                         {
                             "$ref": "#/definitions/AWS::SecurityHub::Standard"
                         },
@@ -226195,6 +239720,9 @@
                         {
                             "$ref": "#/definitions/AWS::SecurityLake::Subscriber"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityLake::SubscriberNotification"
+                        },
                         {
                             "$ref": "#/definitions/AWS::Serverless::Api"
                         },
@@ -226507,6 +240035,9 @@
                         {
                             "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
                         },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::WorkspacesPool"
+                        },
                         {
                             "$ref": "#/definitions/AWS::WorkSpacesThinClient::Environment"
                         },